Merge branch 'next-s3c64xx' into next-s3c
commitc378aa275e1476218a6b438056a4cd48eb1eca0f
authorBen Dooks <ben-linux@fluff.org>
Fri, 14 Aug 2009 14:24:01 +0000 (14 15:24 +0100)
committerBen Dooks <ben-linux@fluff.org>
Fri, 14 Aug 2009 14:24:01 +0000 (14 15:24 +0100)
tree48d19b078758cbab638aeb8ab2978be05232290b
parent215ed3236a17b748cf75a2c23f50028c95302a42
parentc7c8f615c8d1b49225ed86406603e7ac24d2a6d9
Merge branch 'next-s3c64xx' into next-s3c
arch/arm/mach-s3c6400/include/mach/map.h