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)
commit7f0ff702cdf51472750f4b6042866f1b83a11215
tree15ce32849cfb8ff3c7205e97a5f76051c08058b0
parentd35b7a829a13b69c4747b69380b504b6544a2375
parent110d85acd479b80dc11b7fa3abef63285da8ea0c
ARM: Merge next-samsung-s3c64xx-platdeletion

Merge branch 'next-samsung-s3c64xx-platdeletion' into next-samsung

Conflicts:

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