| commit | 009f742bded4cc7c89b901d59452fbfc0eb292c5 | [log] [tgz] |
|---|---|---|
| author | Ben Dooks <ben-linux@fluff.org> | Thu Dec 03 21:53:10 2009 +0000 |
| committer | Ben Dooks <ben-linux@fluff.org> | Thu Dec 03 21:53:10 2009 +0000 |
| tree | 9d4205b21fc69ecd5c124f2834d57d5b022dba0a | |
| parent | f18ea8276bc6b0f8584c442905e9badc2acc8785 [diff] | |
| parent | 92b118f6968ae0788ac659af47b464acd9a754a1 [diff] |
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