alistair23-linux/arch/arm
Olof Johansson 70f3900ee5 - improve #ifdef logic to prevent linker errors with CACHE_FEROCEON_L2
- lsxl board dts fixes
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
 iQEcBAABAgAGBQJQgDpzAAoJEAi3KVZQDZAexg8H/1NBclj9cCeYafHEChm7MelK
 8XtBKsh+5OWxYclQo5oEnD3aKnGpvgueLfxV9DZv+WUeFJYdXaTx3u64PNP0oA/V
 QoCIQWeyrjQMY3eVpVW8Ky+xfoFDXMDcUUNn5zw9lh/cZoTse4OrVPM/zDPykpyH
 dUKGNn9eWSACgLK+4oaLpdMqhBsimbLzd0de7NLmmNjOZxtt1RUDgG1xgwCzosCW
 70TRL5CnoItz1JEkYBpL4QOHZk4yEwQpbAIV7Boy7uDxQqAgqItFHRE45dNvLi/l
 EGFrjEXQT6DEjqByHuDHKD+jFlObbOkGT/bi443RKfjAluJ1P3OA04sWyLKaGGc=
 =xQFf
 -----END PGP SIGNATURE-----

Merge tag 'kirkwood_fixes_for_v3.7' of git://git.infradead.org/users/jcooper/linux into fixes

From Jason Cooper:
 - improve #ifdef logic to prevent linker errors with CACHE_FEROCEON_L2
 - lsxl board dts fixes

* tag 'kirkwood_fixes_for_v3.7' of git://git.infradead.org/users/jcooper/linux:
  ARM: kirkwood: fix buttons on lsxl boards
  ARM: kirkwood: fix LEDs names for lsxl boards
  ARM: Kirkwood: fix disabling CACHE_FEROCEON_L2
2012-10-19 16:17:51 -07:00
..
boot - improve #ifdef logic to prevent linker errors with CACHE_FEROCEON_L2 2012-10-19 16:17:51 -07:00
common ARM: config: sort select statements alphanumerically 2012-10-13 17:11:28 +01:00
configs UAPI Disintegration 2012-10-09 2012-10-09 15:04:25 +01:00
crypto
include Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux 2012-10-14 13:39:34 -07:00
kernel Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal 2012-10-13 10:05:52 +09:00
lib Merge branch 'arch-timers' into for-linus 2012-10-04 23:02:26 +01:00
mach-at91 ARM: config: sort select statements alphanumerically 2012-10-13 17:11:28 +01:00
mach-bcm2835
mach-clps711x ARM: config: sort select statements alphanumerically 2012-10-13 17:11:28 +01:00
mach-cns3xxx
mach-davinci ARM: config: sort select statements alphanumerically 2012-10-13 17:11:28 +01:00
mach-dove ARM: dove: Add crypto engine to DT 2012-10-17 17:20:01 +00:00
mach-ebsa110
mach-ep93xx
mach-exynos ARM: config: sort select statements alphanumerically 2012-10-13 17:11:28 +01:00
mach-footbridge ARM: config: sort select statements alphanumerically 2012-10-13 17:11:28 +01:00
mach-gemini
mach-h720x ARM: config: sort select statements alphanumerically 2012-10-13 17:11:28 +01:00
mach-highbank Merge branch 'for-v3.7' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping 2012-10-02 19:13:12 -07:00
mach-imx ARM: config: sort select statements alphanumerically 2012-10-13 17:11:28 +01:00
mach-integrator ARM: integrator: use __iomem pointers for MMIO, part 2 2012-10-09 17:27:33 +02:00
mach-iop13xx Merge branch 'late/fixes' into fixes 2012-10-07 07:22:32 -07:00
mach-iop32x
mach-iop33x
mach-ixp4xx ARM: config: sort select statements alphanumerically 2012-10-13 17:11:28 +01:00
mach-kirkwood ARM: Kirkwood: fix disabling CACHE_FEROCEON_L2 2012-10-18 17:04:24 +00:00
mach-ks8695 Merge branch 'late/fixes' into fixes 2012-10-07 07:22:32 -07:00
mach-l7200/include/mach
mach-lpc32xx
mach-mmp ARM: config: sort select statements alphanumerically 2012-10-13 17:11:28 +01:00
mach-msm ARM: config: sort select statements alphanumerically 2012-10-13 17:11:28 +01:00
mach-mv78xx0 Merge branch 'late/fixes' into fixes 2012-10-07 07:22:32 -07:00
mach-mvebu
mach-mxs
mach-netx
mach-nomadik ARM: config: sort select statements alphanumerically 2012-10-13 17:11:28 +01:00
mach-omap1 ARM: config: sort select statements alphanumerically 2012-10-13 17:11:28 +01:00
mach-omap2 ARM: OMAP2+: Allow kernel to boot even if GPMC fails to reserve memory 2012-10-17 09:01:14 -07:00
mach-orion5x ARM: soc: late platform updates 2012-10-07 20:55:16 +09:00
mach-picoxcell
mach-prima2 ARM: config: sort select statements alphanumerically 2012-10-13 17:11:28 +01:00
mach-pxa ARM: config: sort select statements alphanumerically 2012-10-13 17:11:28 +01:00
mach-realview ARM: config: sort select statements alphanumerically 2012-10-13 17:11:28 +01:00
mach-rpc ARM: rpc: check device_register return code in ecard_probe 2012-10-07 10:33:09 +02:00
mach-s3c24xx Merge branch 'testing/driver-warnings' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc into fixes 2012-10-19 15:40:18 -07:00
mach-s3c64xx ARM: config: sort select statements alphanumerically 2012-10-13 17:11:28 +01:00
mach-s3c2410
mach-s3c2412 ARM: config: sort select statements alphanumerically 2012-10-13 17:11:28 +01:00
mach-s3c2440 ARM: config: sort select statements alphanumerically 2012-10-13 17:11:28 +01:00
mach-s5p64x0 ARM: config: sort select statements alphanumerically 2012-10-13 17:11:28 +01:00
mach-s5pc100 ARM: config: sort select statements alphanumerically 2012-10-13 17:11:28 +01:00
mach-s5pv210 ARM: config: sort select statements alphanumerically 2012-10-13 17:11:28 +01:00
mach-sa1100 ARM: config: sort select statements alphanumerically 2012-10-13 17:11:28 +01:00
mach-shark Merge branch 'late/fixes' into fixes 2012-10-07 07:22:32 -07:00
mach-shmobile ARM: shmobile: r8a7779: use __iomem pointers for MMIO 2012-10-16 08:58:56 +09:00
mach-socfpga
mach-spear3xx
mach-spear6xx
mach-spear13xx Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma 2012-10-10 11:10:41 +09:00
mach-tegra ARM: tegra: add tegra_timer clock 2012-10-16 11:15:05 -06:00
mach-u300 ARM: config: sort select statements alphanumerically 2012-10-13 17:11:28 +01:00
mach-ux500 ARM: config: sort select statements alphanumerically 2012-10-13 17:11:28 +01:00
mach-versatile ARM: config: sort select statements alphanumerically 2012-10-13 17:11:28 +01:00
mach-vexpress Features: 2012-10-07 07:13:01 +09:00
mach-vt8500 arm: vt8500: Fix build warning in uncompress.h 2012-10-07 14:50:06 -07:00
mach-w90x900
mach-zynq
mm ARM: config: sort select statements alphanumerically 2012-10-13 17:11:28 +01:00
net
nwfpe
oprofile
plat-iop
plat-mxc ARM: config: sort select statements alphanumerically 2012-10-13 17:11:28 +01:00
plat-nomadik ARM: config: sort select statements alphanumerically 2012-10-13 17:11:28 +01:00
plat-omap ARM: OMAP: resolve sparse warning concerning debug_card_init() 2012-10-16 14:05:50 -07:00
plat-orion Merge branch 'samsung_platform_data' into staging/for_v3.7 2012-10-05 22:32:05 -03:00
plat-pxa
plat-s3c24xx ARM: config: sort select statements alphanumerically 2012-10-13 17:11:28 +01:00
plat-samsung ARM: config: sort select statements alphanumerically 2012-10-13 17:11:28 +01:00
plat-spear ARM: config: sort select statements alphanumerically 2012-10-13 17:11:28 +01:00
plat-versatile Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm 2012-10-07 21:20:57 +09:00
tools
vfp
xen
Kconfig Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux 2012-10-14 13:39:34 -07:00
Kconfig-nommu
Kconfig.debug
Makefile Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm 2012-10-07 21:20:57 +09:00