android_kernel_xiaomi_sm8350/arch/arm
Russell King b6825d2df5 Merge branch 'omap-all' into devel
Conflicts:

	arch/arm/mach-omap2/gpmc.c
	arch/arm/mach-omap2/irq.c
2008-10-14 22:24:42 +01:00
..
boot [ARM] 5229/3: Replace some ARMv7 opcodes with the instruction name 2008-10-03 11:32:09 +01:00
common Merge branch 'pxa-all' into devel 2008-10-09 21:33:02 +01:00
configs Merge branch 'omap-all' into devel 2008-10-14 22:24:42 +01:00
include/asm Merge branch 'for-rmk' of git://source.mvista.com/git/linux-davinci-2.6.git 2008-10-09 21:33:05 +01:00
kernel Merge branch 'pxa-all' into devel 2008-10-09 21:33:02 +01:00
lib Merge branch 'ptebits' into devel 2008-10-09 21:31:56 +01:00
mach-aaec2000
mach-at91 Merge branch 'pxa-all' into devel 2008-10-09 21:33:02 +01:00
mach-clps711x
mach-clps7500 [ARM] mm: enable sparsemem on clps7500 and RiscPC 2008-10-01 17:24:04 +01:00
mach-davinci Merge branch 'for-rmk' of git://source.mvista.com/git/linux-davinci-2.6.git 2008-10-09 21:33:05 +01:00
mach-ebsa110
mach-ep93xx Merge branch 'pxa-all' into devel 2008-10-09 21:33:02 +01:00
mach-footbridge Merge branch 'pxa-all' into devel 2008-10-09 21:33:02 +01:00
mach-h720x Merge branch 'pxa-all' into devel 2008-10-09 21:33:02 +01:00
mach-imx Merge branch 'for-rmk' of git://pasiphae.extern.pengutronix.de/git/imx/linux-2.6.git 2008-10-09 21:33:03 +01:00
mach-integrator Merge branch 'pxa-all' into devel 2008-10-09 21:33:02 +01:00
mach-iop13xx Merge branch 'pxa-all' into devel 2008-10-09 21:33:02 +01:00
mach-iop32x
mach-iop33x
mach-ixp4xx
mach-ixp23xx Merge branch 'pxa-all' into devel 2008-10-09 21:33:02 +01:00
mach-ixp2000 Merge branch 'pxa-all' into devel 2008-10-09 21:33:02 +01:00
mach-kirkwood [ARM] Kirkwood: add support for L2 cache WB/WT selection 2008-09-25 16:29:21 -04:00
mach-ks8695 Merge branches 'machtypes', 'core', 'ep93xx', 'ks8695', 'netdev' and 'sa1100' into devel 2008-10-09 21:31:54 +01:00
mach-l7200
mach-lh7a40x Merge branch 'pxa-all' into devel 2008-10-09 21:33:02 +01:00
mach-loki
mach-msm
mach-mv78xx0 Merge branch 'for-rmk' of git://git.marvell.com/orion 2008-10-09 21:33:07 +01:00
mach-mx2
mach-mx3 Merge branch 'for-rmk' of git://source.mvista.com/git/linux-davinci-2.6.git 2008-10-09 21:33:05 +01:00
mach-netx Merge branch 'pxa-all' into devel 2008-10-09 21:33:02 +01:00
mach-ns9xxx Merge branch 'pxa-all' into devel 2008-10-09 21:33:02 +01:00
mach-omap1 Merge branch 'omap-all' into devel 2008-10-14 22:24:42 +01:00
mach-omap2 Merge branch 'omap-all' into devel 2008-10-14 22:24:42 +01:00
mach-orion5x Merge branch 'for-rmk' of git://git.marvell.com/orion 2008-10-09 21:33:07 +01:00
mach-pnx4008
mach-pxa Merge branch 'for-rmk' of git://source.mvista.com/git/linux-davinci-2.6.git 2008-10-09 21:33:05 +01:00
mach-realview
mach-rpc [ARM] mm: enable sparsemem on clps7500 and RiscPC 2008-10-01 17:24:04 +01:00
mach-s3c2400
mach-s3c2410 Merge branch 'pxa-all' into devel 2008-10-09 21:33:02 +01:00
mach-s3c2412 Merge branch 'pxa-all' into devel 2008-10-09 21:33:02 +01:00
mach-s3c2440 Merge branch 'pxa-all' into devel 2008-10-09 21:33:02 +01:00
mach-s3c2442
mach-s3c2443 Merge branch 'pxa-all' into devel 2008-10-09 21:33:02 +01:00
mach-sa1100 Merge branch 'pxa-all' into devel 2008-10-09 21:33:02 +01:00
mach-shark
mach-versatile Merge branch 'pxa-all' into devel 2008-10-09 21:33:02 +01:00
mm Merge branch 'omap-all' into devel 2008-10-14 22:24:42 +01:00
nwfpe
oprofile
plat-iop
plat-mxc Merge branch 'for-rmk' of git://pasiphae.extern.pengutronix.de/git/imx/linux-2.6.git 2008-10-09 21:33:03 +01:00
plat-omap Merge branch 'omap-all' into devel 2008-10-14 22:24:42 +01:00
plat-orion
plat-s3c
plat-s3c24xx Merge branch 'pxa-all' into devel 2008-10-09 21:33:02 +01:00
tools [ARM] Update mach-types 2008-09-25 10:12:25 +01:00
vfp
Kconfig Merge branch 'for-rmk' of git://git.marvell.com/orion 2008-10-09 21:33:07 +01:00
Kconfig-nommu
Kconfig.debug
Makefile Merge branch 'omap-all' into devel 2008-10-14 22:24:42 +01:00