ed40d0c472
Conflicts: sound/soc/pxa/pxa2xx-i2s.c |
||
---|---|---|
.. | ||
include/mach | ||
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 |