ARM: Merge next-samsung-s3c64xx-platdeletion
authorBen Dooks <ben-linux@fluff.org>
Mon, 22 Feb 2010 23:38:26 +0000 (23:38 +0000)
committerBen Dooks <ben-linux@fluff.org>
Mon, 22 Feb 2010 23:38:26 +0000 (23:38 +0000)
Merge branch 'next-samsung-s3c64xx-platdeletion' into next-samsung

Conflicts:

arch/arm/mach-s3c64xx/Makefile (fixed)


Trivial merge