David S. Miller 30d0844bdc Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/mellanox/mlx5/core/en.h drivers/net/ethernet/mellanox/mlx5/core/en_main.c drivers/net/usb/r8152.c All three conflicts were overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-07-06 10:35:22 -07:00
..
boot	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-06-30 05:03:36 -04:00
common
configs	Two fixes for v4.7 cycle for build issues:	2016-06-03 12:15:00 -07:00
crypto
firmware
include	tree wide: get rid of __GFP_REPEAT for order-0 allocations part I	2016-06-24 17:23:52 -07:00
kernel	Fixes for omaps for v4.7-rc cycle:	2016-06-18 22:57:48 -07:00
kvm	KVM: arm/arm64: Stop leaking vcpu pid references	2016-06-27 13:08:10 +02:00
lib
mach-alpine
mach-artpec
mach-asm9260
mach-aspeed
mach-at91
mach-axxia
mach-bcm
mach-berlin
mach-clps711x
mach-cns3xxx
mach-davinci
mach-digicolor
mach-dove
mach-ebsa110
mach-efm32
mach-ep93xx
mach-exynos	Two fixes for v4.7 cycle for build issues:	2016-06-03 12:15:00 -07:00
mach-footbridge
mach-gemini
mach-highbank
mach-hisi
mach-imx	ARM: imx6ul: Fix Micrel PHY mask	2016-06-09 20:49:29 +08:00
mach-integrator
mach-iop13xx
mach-iop32x
mach-iop33x
mach-ixp4xx
mach-keystone
mach-ks8695
mach-lpc18xx
mach-lpc32xx	ARM: lpc32xx: fix NR_IRQS confict	2016-05-24 19:32:46 +00:00
mach-mediatek
mach-meson
mach-mmp
mach-moxart
mach-mv78xx0
mach-mvebu
mach-mxs
mach-netx
mach-nomadik
mach-nspire
mach-omap1	ARM: OMAP1: fix ams-delta FIQ handler to work with sparse IRQ	2016-06-17 02:37:36 -07:00
mach-omap2	Fixes for omaps for v4.7-rc cycle:	2016-06-18 22:57:48 -07:00
mach-orion5x
mach-oxnas
mach-picoxcell
mach-prima2
mach-pxa	ARM: SoC fixes for 4.7	2016-05-24 15:50:58 -07:00
mach-qcom
mach-realview
mach-rockchip
mach-rpc
mach-s3c24xx
mach-s3c64xx
mach-s5pv210
mach-sa1100
mach-shmobile
mach-socfpga
mach-spear
mach-sti
mach-stm32
mach-sunxi
mach-tango
mach-tegra
mach-u300
mach-uniphier
mach-ux500
mach-versatile
mach-vexpress	vexpress/spc: Remove CLK_IS_ROOT	2016-06-01 14:48:01 -07:00
mach-vt8500
mach-w90x900
mach-zx
mach-zynq
mm
net
nwfpe
oprofile
plat-iop
plat-omap
plat-orion
plat-pxa
plat-samsung	Two fixes for v4.7 cycle for build issues:	2016-06-03 12:15:00 -07:00
plat-versatile
probes
tools
vdso
vfp
xen
Kconfig
Kconfig-nommu
Kconfig.debug
Makefile