Russell King ed40d0c472 Merge branch 'origin' into devel ... Conflicts: sound/soc/pxa/pxa2xx-i2s.c		2009-03-28 20:29:51 +00:00
..
include/mach	Merge branch 'origin' into devel	2009-03-28 20:29:51 +00:00
bast-ide.c
bast-irq.c
dma.c
gpio.c
h1940-bluetooth.c
irq.c
Kconfig
mach-amlm5900.c
mach-bast.c
mach-h1940.c
mach-n30.c
mach-otom.c
mach-qt2410.c
mach-smdk2410.c
mach-tct_hammer.c
mach-vr1000.c
Makefile
Makefile.boot
nor-simtec.c
nor-simtec.h
pm-h1940.S
pm.c
s3c2410.c
sleep.S
usb-simtec.c
usb-simtec.h