ARM: Merge next-s3c64xx-updates
authorBen Dooks <ben-linux@fluff.org>
Thu, 3 Dec 2009 21:53:10 +0000 (21:53 +0000)
committerBen Dooks <ben-linux@fluff.org>
Thu, 3 Dec 2009 21:53:10 +0000 (21:53 +0000)
commit009f742bded4cc7c89b901d59452fbfc0eb292c5
tree9d4205b21fc69ecd5c124f2834d57d5b022dba0a
parentf18ea8276bc6b0f8584c442905e9badc2acc8785
parent92b118f6968ae0788ac659af47b464acd9a754a1
ARM: Merge next-s3c64xx-updates

Merge branch 'next-s3c64xx-updates' into for-rmk

Conflicts:

arch/arm/plat-s3c/dev-hsmmc2.c
arch/arm/plat-s3c/include/plat/sdhci.h
arch/arm/plat-s3c/dev-hsmmc2.c
arch/arm/plat-s3c/include/plat/sdhci.h