diff options
| author | Ben Dooks | 2009-12-03 22:53:10 +0100 |
|---|---|---|
| committer | Ben Dooks | 2009-12-03 22:53:10 +0100 |
| commit | 009f742bded4cc7c89b901d59452fbfc0eb292c5 (patch) | |
| tree | 9d4205b21fc69ecd5c124f2834d57d5b022dba0a /drivers/scsi/st.h | |
| parent | ARM: Merge next-s3c24xx-dev-rtp (diff) | |
| parent | ARM: S3C64XX: add HSMMC2 support (diff) | |
| download | kernel-qcow2-linux-009f742bded4cc7c89b901d59452fbfc0eb292c5.tar.gz kernel-qcow2-linux-009f742bded4cc7c89b901d59452fbfc0eb292c5.tar.xz kernel-qcow2-linux-009f742bded4cc7c89b901d59452fbfc0eb292c5.zip | |
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 'drivers/scsi/st.h')
0 files changed, 0 insertions, 0 deletions