alistair23-linux/arch/arm
Olof Johansson 5d3a0a9586 Merge branch 'next/cleanup2' into HEAD
Conflicts:
	arch/arm/Kconfig
	arch/arm/Makefile
	arch/arm/mach-bcmring/arch.c
	arch/arm/mach-tegra/devices.c
	arch/arm/mach-tegra/dma.c
2012-10-01 14:25:41 -07:00
..
boot Merge branch 'next/dt' into HEAD 2012-10-01 14:23:11 -07:00
common
configs Merge branch 'next/cleanup2' into HEAD 2012-10-01 14:25:41 -07:00
include/asm Merge branch 'next/dt' into HEAD 2012-10-01 14:23:11 -07:00
kernel Merge branch 'next/cleanup' into HEAD 2012-10-01 14:15:02 -07:00
lib
mach-at91 Merge branch 'cleanup/__iomem' into next/cleanup2 2012-09-28 22:07:14 +02:00
mach-bcm2835 ARM: bcm2835: add stub clock driver 2012-09-19 19:08:53 -06:00
mach-clps711x ARM: clps711x: Remove board support for CEIVA 2012-09-28 21:14:08 +02:00
mach-cns3xxx
mach-davinci
mach-dove Merge branch 'next/dt' into HEAD 2012-10-01 14:23:11 -07:00
mach-ebsa110 ARM: ebsa110: use __iomem pointers for MMIO 2012-09-18 10:15:12 +02:00
mach-ep93xx
mach-exynos Merge branch 'next/soc' into HEAD 2012-10-01 14:19:17 -07:00
mach-footbridge
mach-gemini
mach-h720x
mach-highbank
mach-imx Merge branch 'next/dt' into HEAD 2012-10-01 14:23:11 -07:00
mach-integrator Merge branch 'cleanup/__iomem' into next/cleanup 2012-09-22 10:24:29 -07:00
mach-iop13xx Merge branch 'cleanup/__iomem' into next/cleanup 2012-09-22 10:24:29 -07:00
mach-iop32x Merge branch 'cleanup/__iomem' into next/cleanup 2012-09-22 10:24:29 -07:00
mach-iop33x
mach-ixp4xx ARM: ixp4xx: use __iomem pointers for MMIO 2012-09-19 15:19:13 +02:00
mach-kirkwood Remove the ancient omap specific atags that are no longer needed. 2012-09-16 19:28:42 -07:00
mach-ks8695 Merge branch 'cleanup/__iomem' into next/cleanup 2012-09-22 10:24:29 -07:00
mach-l7200/include/mach
mach-lpc32xx Merge branch 'next/soc' into HEAD 2012-10-01 14:19:17 -07:00
mach-mmp Merge branch 'next/dt' into HEAD 2012-10-01 14:23:11 -07:00
mach-msm Merge branch 'next/dt' into HEAD 2012-10-01 14:23:11 -07:00
mach-mv78xx0
mach-mvebu
mach-mxs Merge branch 'next/dt' into HEAD 2012-10-01 14:23:11 -07:00
mach-netx
mach-nomadik Merge branch 'next/cleanup' into HEAD 2012-10-01 14:15:02 -07:00
mach-omap1 ARM: OMAP1: Move irda.h from plat to mach 2012-09-20 15:03:58 -07:00
mach-omap2 Merge branch 'next/dt' into HEAD 2012-10-01 14:23:11 -07:00
mach-orion5x Merge branch 'next/cleanup2' into HEAD 2012-10-01 14:25:41 -07:00
mach-picoxcell
mach-prima2 Merge branch 'next/dt' into HEAD 2012-10-01 14:23:11 -07:00
mach-pxa Merge branch 'next/dt' into HEAD 2012-10-01 14:23:11 -07:00
mach-realview Merge branch 'next/cleanup' into HEAD 2012-10-01 14:15:02 -07:00
mach-rpc
mach-s3c24xx Merge branch 'next/soc' into HEAD 2012-10-01 14:19:17 -07:00
mach-s3c64xx
mach-s3c2410
mach-s3c2412
mach-s3c2440
mach-s5p64x0
mach-s5pc100
mach-s5pv210
mach-sa1100 ARM: sa1100: use __iomem pointers for MMIO 2012-09-19 15:19:16 +02:00
mach-shark
mach-shmobile Merge branch 'next/dt' into HEAD 2012-10-01 14:23:11 -07:00
mach-socfpga
mach-spear3xx
mach-spear6xx
mach-spear13xx ARM: spear13xx: use __iomem pointers for MMIO 2012-09-19 15:19:17 +02:00
mach-tegra Merge branch 'next/cleanup2' into HEAD 2012-10-01 14:25:41 -07:00
mach-u300
mach-ux500 Merge branch 'next/cleanup2' into HEAD 2012-10-01 14:25:41 -07:00
mach-versatile
mach-vexpress
mach-vt8500 arm: vt8500: Fixup for missing gpio.h 2012-09-29 14:14:25 -07:00
mach-w90x900
mach-zynq
mm Merge branch 'next/dt' into HEAD 2012-10-01 14:23:11 -07:00
net
nwfpe
oprofile
plat-iop
plat-mxc Merge branch 'next/dt' into HEAD 2012-10-01 14:23:11 -07:00
plat-nomadik
plat-omap Merge branch 'next/dt' into HEAD 2012-10-01 14:23:11 -07:00
plat-orion
plat-pxa
plat-s3c24xx
plat-samsung Merge branch 'next/soc' into HEAD 2012-10-01 14:19:17 -07:00
plat-spear
plat-versatile
tools Merge branch 'next/cleanup2' into HEAD 2012-10-01 14:25:41 -07:00
vfp
Kconfig Merge branch 'next/cleanup2' into HEAD 2012-10-01 14:25:41 -07:00
Kconfig-nommu
Kconfig.debug
Makefile Merge branch 'next/cleanup2' into HEAD 2012-10-01 14:25:41 -07:00