Ben Dooks 56c035c9ce Merge branch 'next-s3c64xx-device' into next-merged ...

Conflicts:

	arch/arm/mach-s3c2440/mach-at2440evb.c

2008-12-18 16:17:37 +00:00

..

cpu.c

[ARM] S3C: Add header for initial i2c device core setup.

2008-12-15 23:47:03 +00:00

Kconfig

[ARM] SMDK6410: Add LCD (LCD48WVGA) definitions

2008-12-15 23:57:26 +00:00

mach-smdk6410.c

Merge branch 'next-s3c64xx-device' into next-merged

2008-12-18 16:17:37 +00:00

Makefile

[ARM] S3C6410: Add helper for setting SDHCI device information

2008-12-15 23:39:34 +00:00

setup-sdhci.c

[ARM] S3C6410: Add helper for setting SDHCI device information

2008-12-15 23:39:34 +00:00