David S. Miller 5510b3c2a1 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: arch/s390/net/bpf_jit_comp.c drivers/net/ethernet/ti/netcp_ethss.c net/bridge/br_multicast.c net/ipv4/ip_fragment.c All four conflicts were cases of simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-07-31 23:52:20 -07:00
..
boot	dts: imx7: fix sd card gpio polarity specified in device tree	2015-07-24 10:18:36 +02:00
common	TTY/Serial driver patches for 4.2-rc1	2015-06-26 15:53:22 -07:00
configs	Allwinner late changes for 4.2	2015-07-09 15:08:44 -07:00
crypto
firmware
include	Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm	2015-07-18 11:03:48 -07:00
kernel	ARM: 8402/1: perf: Don't use of_node after putting it	2015-07-17 15:08:38 +01:00
kvm	Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm	2015-06-26 12:20:00 -07:00
lib	ARM: avoid unwanted GCC memset()/memcpy() optimisations for IO variants	2015-07-03 20:46:15 +01:00
mach-alpine
mach-asm9260
mach-at91	genalloc: rename dev_get_gen_pool() to gen_pool_get()	2015-06-30 19:45:01 -07:00
mach-axxia
mach-bcm	ARM: BCM: Do not select CONFIG_MTD_NAND_BRCMNAND	2015-07-01 13:04:13 -07:00
mach-berlin	ARM: SoC: driver updates for v4.2	2015-06-26 11:54:29 -07:00
mach-clps711x
mach-cns3xxx
mach-davinci	ARM: SoC cleanups for v4.2	2015-06-26 11:08:27 -07:00
mach-digicolor
mach-dove	ARM: dove: fix legacy dove IRQ numbers	2015-06-24 11:05:57 +02:00
mach-ebsa110
mach-efm32
mach-ep93xx	ARM: ep93xx: simone: support for SPI-based MMC/SD cards	2015-06-11 14:21:29 -07:00
mach-exynos	The changes to the common clock framework for 4.2 are dominated by new	2015-07-01 19:22:00 -07:00
mach-footbridge
mach-gemini	ARM: gemini: Fix race in installing GPIO chained IRQ handler	2015-06-18 14:03:08 +02:00
mach-highbank
mach-hisi	arm/mach-hisi: remove legacy __CPUINIT section that crept in	2015-06-16 14:12:21 -04:00
mach-imx	ARM: imx6: gpc: always enable PU domain if CONFIG_PM is not set	2015-07-08 22:52:08 +08:00
mach-integrator	ARM: 8365/1: introduce sp804_timer_disable and remove arm_timer.h inclusion	2015-06-02 09:58:18 +01:00
mach-iop13xx
mach-iop32x
mach-iop33x
mach-ixp4xx
mach-keystone	Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm	2015-06-26 12:20:00 -07:00
mach-ks8695
mach-lpc18xx
mach-lpc32xx	Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2015-07-01 15:19:35 -07:00
mach-mediatek
mach-meson
mach-mmp
mach-moxart
mach-mv78xx0
mach-mvebu	ARM: SoC: late fixes and dependencies	2015-07-02 14:40:49 -07:00
mach-mxs
mach-netx
mach-nomadik
mach-nspire	ARM: 8366/1: move Dual-Timer SP804 driver to drivers/clocksource	2015-06-02 09:58:18 +01:00
mach-omap1	ARM: SoC: platform support for v4.2	2015-06-26 11:34:35 -07:00
mach-omap2	ARM: OMAP2+: Add HAVE_ARM_SCU for AM43XX	2015-07-15 03:03:01 -07:00
mach-orion5x
mach-picoxcell
mach-prima2	move CSR rtc iobrg read/write API to be regmap	2015-07-08 14:20:12 -07:00
mach-pxa	ARM: pxa: fix dm9000 platform data regression	2015-07-16 22:43:59 +02:00
mach-qcom
mach-realview	ARM: 8366/1: move Dual-Timer SP804 driver to drivers/clocksource	2015-06-02 09:58:18 +01:00
mach-rockchip	Remove __cpuinit macros and users.	2015-07-02 09:54:14 -07:00
mach-rpc
mach-s3c24xx
mach-s3c64xx
mach-s5pv210
mach-sa1100	Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm	2015-06-26 12:20:00 -07:00
mach-shmobile	ARM: SoC: platform support for v4.2	2015-06-26 11:34:35 -07:00
mach-socfpga	genalloc: rename dev_get_gen_pool() to gen_pool_get()	2015-06-30 19:45:01 -07:00
mach-spear	Update Viresh Kumar's email address	2015-07-17 16:39:53 -07:00
mach-sti
mach-stm32
mach-sunxi	Allwinner late changes for 4.2	2015-07-09 15:08:44 -07:00
mach-tegra	ARM: SoC: platform support for v4.2	2015-06-26 11:34:35 -07:00
mach-u300
mach-uniphier
mach-ux500
mach-versatile	ARM: 8366/1: move Dual-Timer SP804 driver to drivers/clocksource	2015-06-02 09:58:18 +01:00
mach-vexpress	arm: don't use module_init in non-modular mach-vexpress/spc.c code	2015-06-16 14:12:29 -04:00
mach-vt8500
mach-w90x900
mach-zx
mach-zynq	ARM: SoC: platform support for v4.2	2015-06-26 11:34:35 -07:00
mm	ARM: invalidate L1 before enabling coherency	2015-07-17 15:08:40 +01:00
net	ARM: net: add support for BPF_ANC | SKF_AD_HATYPE in ARM JIT.	2015-07-27 14:57:41 -07:00
nwfpe
oprofile
plat-iop
plat-omap
plat-orion
plat-pxa
plat-samsung	ARM: SAMSUNG: Constify platform_device_id	2015-06-06 02:18:02 +09:00
plat-versatile
probes
tools
vdso	Merge branches 'fixes' and 'ioremap' into for-linus	2015-07-07 12:35:33 +01:00
vfp
xen	xen: Include xen/page.h rather than asm/xen/page.h	2015-06-17 16:14:18 +01:00
Kconfig	Merge branches 'fixes' and 'ioremap' into for-linus	2015-07-07 12:35:33 +01:00
Kconfig-nommu
Kconfig.debug	Merge branches 'fixes' and 'ioremap' into for-linus	2015-07-07 12:35:33 +01:00
Makefile	Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm	2015-06-26 12:20:00 -07:00