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
..
mach	[ARM] S3C24XX: Add default <mach/io.h> header	2008-12-15 21:45:55 +00:00
plat	Merge branch 'next-s3c64xx-device' into next-merged	2008-12-18 16:17:37 +00:00