Merge branch 'next-s3c64xx-moves' into next-s3c
authorBen Dooks <ben-linux@fluff.org>
Fri, 14 Aug 2009 14:24:06 +0000 (15:24 +0100)
committerBen Dooks <ben-linux@fluff.org>
Fri, 14 Aug 2009 14:24:06 +0000 (15:24 +0100)
commitb282e29b547937d1610f38d6aa1c485426b62650
tree62741a6d17e910e7b77a5cc4e94c44b7e587645c
parentc378aa275e1476218a6b438056a4cd48eb1eca0f
parentc233d94931cebc8ec805fb98856f34ad16d49e4f
Merge branch 'next-s3c64xx-moves' into next-s3c
arch/arm/mach-s3c2410/include/mach/map.h
arch/arm/mach-s3c6400/include/mach/map.h
arch/arm/plat-s3c24xx/Makefile
arch/arm/plat-s3c24xx/devs.c