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

S3C24XX: Move and update IIS headers

2009-03-05 12:00:59 +00:00

gpio.c

…

h1940-bluetooth.c

…

irq.c

…

Kconfig

…

mach-amlm5900.c

…

mach-bast.c

…

mach-h1940.c

[ARM] S3C: Rename s3c2410_pm_init to s3c_pm_init.

2009-03-08 12:35:47 +00:00

mach-n30.c

…

mach-otom.c

…

mach-qt2410.c

[ARM] S3C: Rename s3c2410_pm_init to s3c_pm_init.

2009-03-08 12:35:47 +00:00

mach-smdk2410.c

…

mach-tct_hammer.c

…

mach-vr1000.c

…

Makefile

…

Makefile.boot

…

nor-simtec.c

…

nor-simtec.h

…

pm-h1940.S

…

pm.c

[ARM] S3C: Rename sleep.S functions to be non-cpu specific

2009-03-08 12:37:05 +00:00

s3c2410.c

…

sleep.S

…

usb-simtec.c

USB: S3C: Move usb-control.h to platform include

2009-03-24 16:20:45 -07:00

usb-simtec.h

…