switch-linux/arch/arm
David S. Miller d5c1d8c567 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	net/netfilter/nf_tables_core.c

The nf_tables_core.c conflict was resolved using a conflict resolution
from Stephen Rothwell as a guide.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-03-23 22:22:43 -04:00
..
boot Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-03-20 18:51:09 -04:00
common
configs ARM: vexpress: update CONFIG_USB_ISP1760 option 2015-03-11 15:37:21 +01:00
crypto crypto: arm/aes update NEON AES module to latest OpenSSL version 2015-03-02 23:18:26 +13:00
firmware
include Merge git://git.kernel.org/pub/scm/virt/kvm/kvm 2015-03-17 10:31:36 -07:00
kernel ARM: 8313/1: Use read_cpuid_ext() macro instead of inline asm 2015-03-18 10:14:37 +00:00
kvm arm64: KVM: Do not use pgd_index to index stage-2 pgd 2015-03-11 14:24:36 +01:00
lib
mach-asm9260 clockevents: asm9260: Fix compilation error with sparc/sparc64 allyesconfig 2015-02-25 10:28:22 +01:00
mach-at91 ARM: at91: pm_slowclock: fix the compilation error 2015-03-11 15:49:47 +01:00
mach-axxia
mach-bcm
mach-berlin
mach-clps711x
mach-cns3xxx
mach-davinci
mach-digicolor
mach-dove
mach-ebsa110
mach-efm32
mach-ep93xx
mach-exynos Merge tag 'samsung-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes 2015-03-04 21:01:25 +01:00
mach-footbridge
mach-gemini
mach-highbank
mach-hisi
mach-imx ARM: imx: fix struct clk pointer comparing 2015-03-11 16:00:20 -07:00
mach-integrator
mach-iop13xx
mach-iop32x
mach-iop33x
mach-ixp4xx
mach-keystone
mach-ks8695
mach-lpc32xx
mach-mediatek
mach-meson
mach-mmp
mach-moxart
mach-msm net: smc91x: use run-time configuration on all ARM machines 2015-02-28 12:56:56 -05:00
mach-mv78xx0
mach-mvebu
mach-mxs
mach-netx ARM: 8272/1: netx: Migrate DEBUG_LL macros to shared directory 2015-01-21 15:49:40 +00:00
mach-nomadik
mach-nspire
mach-omap1
mach-omap2 ARM: OMAP2+: Fix wl12xx on dm3730-evm with mainline u-boot 2015-03-06 10:37:34 -08:00
mach-orion5x
mach-picoxcell
mach-prima2
mach-pxa ARM: fix typos in smc91x platform data 2015-03-04 23:32:26 -05:00
mach-qcom
mach-realview net: smc91x: use run-time configuration on all ARM machines 2015-02-28 12:56:56 -05:00
mach-rockchip
mach-rpc
mach-s3c24xx
mach-s3c64xx
mach-s5pv210
mach-sa1100 ARM: fix typos in smc91x platform data 2015-03-04 23:32:26 -05:00
mach-shmobile
mach-socfpga ARM: socfpga: make sure socfpga_cpu1start_addr is properly flushed 2015-03-04 13:03:17 -06:00
mach-spear
mach-sti ARM: STi: Add STiH410 SoC support 2015-03-11 15:34:45 +01:00
mach-sunxi
mach-tegra
mach-u300
mach-ux500
mach-versatile
mach-vexpress
mach-vt8500
mach-w90x900
mach-zynq
mm ARM: 8311/1: Don't use is_module_addr in setting page attributes 2015-03-18 10:13:46 +00:00
net
nwfpe
oprofile
plat-iop
plat-omap
plat-orion
plat-pxa
plat-samsung
plat-versatile
probes
tools
vfp
xen
Kconfig
Kconfig-nommu
Kconfig.debug
Makefile ARM: digicolor: add the machine directory to Makefile 2015-03-11 15:36:34 +01:00