aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-s3c/include/plat/sdhci.h
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2009-12-03 21:33:01 +0000
committerBen Dooks <ben-linux@fluff.org>2009-12-03 21:33:01 +0000
commitf18ea8276bc6b0f8584c442905e9badc2acc8785 (patch)
treef71e3f05420f35f7eaf838d93fb83d665aedcac4 /arch/arm/plat-s3c/include/plat/sdhci.h
parentARM: Merge next-s3c24xx-simtec (diff)
parentARM: H1940: Convert h1940 bluetooth driver to rfkill (diff)
downloadlinux-dev-f18ea8276bc6b0f8584c442905e9badc2acc8785.tar.xz
linux-dev-f18ea8276bc6b0f8584c442905e9badc2acc8785.zip
ARM: Merge next-s3c24xx-dev-rtp
Merge branch 'next-s3c24xx-dev-rtp' into for-rmk Conflicts: arch/arm/mach-s3c2440/mach-anubis.c
Diffstat (limited to 'arch/arm/plat-s3c/include/plat/sdhci.h')
0 files changed, 0 insertions, 0 deletions