Russell King ed40d0c472 Merge branch 'origin' into devel ...

Conflicts:
	sound/soc/pxa/pxa2xx-i2s.c

2009-03-28 20:29:51 +00:00

..

clock.c

…

dma.c

S3C24XX: Move and update IIS headers

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

dsc.c

…

irq.c

…

Kconfig

…

mach-anubis.c

…

mach-at2440evb.c

[ARM] 5358/1: AT2440EVB: Use new include path of mci.h

2009-01-08 16:29:41 +00:00

mach-nexcoder.c

…

mach-osiris.c

…

mach-rx3715.c

[ARM] S3C: Rename s3c2410_pm_init to s3c_pm_init.

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

mach-smdk2440.c

…

Makefile

…

s3c2440.c

…