diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2009-12-03 21:53:10 +0000 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2009-12-03 21:53:10 +0000 |
| commit | 009f742bded4cc7c89b901d59452fbfc0eb292c5 (patch) | |
| tree | 9d4205b21fc69ecd5c124f2834d57d5b022dba0a /arch/arm/plat-s3c/dev-hsmmc2.c | |
| parent | f18ea8276bc6b0f8584c442905e9badc2acc8785 (diff) | |
| parent | 92b118f6968ae0788ac659af47b464acd9a754a1 (diff) | |
| download | op-kernel-dev-009f742bded4cc7c89b901d59452fbfc0eb292c5.zip op-kernel-dev-009f742bded4cc7c89b901d59452fbfc0eb292c5.tar.gz | |
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
Diffstat (limited to 'arch/arm/plat-s3c/dev-hsmmc2.c')
| -rw-r--r-- | arch/arm/plat-s3c/dev-hsmmc2.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/plat-s3c/dev-hsmmc2.c b/arch/arm/plat-s3c/dev-hsmmc2.c index 082e55a..824580b 100644 --- a/arch/arm/plat-s3c/dev-hsmmc2.c +++ b/arch/arm/plat-s3c/dev-hsmmc2.c @@ -1,6 +1,10 @@ /* linux/arch/arm/plat-s3c/dev-hsmmc2.c * * Copyright (c) 2009 Samsung Electronics + * Copyright (c) 2009 Maurus Cuelenaere + * + * Based on arch/arm/plat-s3c/dev-hsmmc1.c + * original file Copyright (c) 2008 Simtec Electronics * * S3C series device definition for hsmmc device 2 * |
