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
Kconfig
mach-smdk6410.c
Makefile
setup-sdhci.c