Russell King 4045407fd7 Merge branch 'restart-cleanup' into restart ... Conflicts: arch/arm/kernel/setup.c		2012-01-05 12:56:44 +00:00
..
include/mach	Merge branch 'restart-cleanup' into restart	2012-01-05 12:56:44 +00:00
aspenite.c	Merge git://git.infradead.org/mtd-2.6	2011-11-07 09:11:16 -08:00
avengers_lite.c
brownstone.c	Merge branch 'next/devel2' of git://git.linaro.org/people/arnd/arm-soc	2011-11-05 18:21:21 -07:00
clock.c
clock.h	ARM: pxa: use correct __iomem annotations	2011-10-08 21:03:07 +08:00
common.c	ARM: pxa: use correct __iomem annotations	2011-10-08 21:03:07 +08:00
common.h
devices.c
flint.c
gplugd.c	ARM: pxa168/gplugd: add the correct SSP device	2011-11-17 08:21:58 +08:00
irq-mmp2.c
irq-pxa168.c
jasper.c	ARM: 7104/1: plat-pxa: break out GPIO driver specifics	2011-10-01 23:45:34 +01:00
Kconfig	ARM: mmp: rename SHEEVAD to GPLUGD	2011-10-25 20:28:49 +08:00
Makefile	Merge branch 'next/devel2' of git://git.linaro.org/people/arnd/arm-soc	2011-11-05 18:21:21 -07:00
Makefile.boot	ARM: 7022/1: allow to detect conflicting zreladdrs	2011-10-17 09:12:40 +01:00
mmp2.c	Merge branch 'next/devel2' of git://git.linaro.org/people/arnd/arm-soc	2011-11-05 18:21:21 -07:00
pxa168.c	Merge branch 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm	2011-10-27 08:39:10 +02:00
pxa910.c	ARM: 7104/1: plat-pxa: break out GPIO driver specifics	2011-10-01 23:45:34 +01:00
sram.c	ARM: mmp: add sram allocator	2011-10-25 20:29:20 +08:00
tavorevb.c	ARM: 7104/1: plat-pxa: break out GPIO driver specifics	2011-10-01 23:45:34 +01:00
teton_bga.c
time.c	ARM: mmp: Change the way we use timer 0 as clockevent timer.	2011-08-11 10:10:46 +08:00
ttc_dkb.c	ARM: 7006/1: Migrate to asm-generic wrapper support	2011-10-17 09:12:40 +01:00