summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c64xx/mach-smartq7.c
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2010-05-20 19:40:24 +0900
committerBen Dooks <ben-linux@fluff.org>2010-05-20 19:40:24 +0900
commit45c8fa878475b16467109cf6534af03b27e28d10 (patch)
treea7c66c65dbc38774dcbba0d2965b1f851fcc1578 /arch/arm/mach-s3c64xx/mach-smartq7.c
parent84eb9ecce20acfd287ba0d623fe5e99bfab08686 (diff)
parentef2f07d31c6b890e0cc3966d4a27fa1d49b740f5 (diff)
downloadop-kernel-dev-45c8fa878475b16467109cf6534af03b27e28d10.zip
op-kernel-dev-45c8fa878475b16467109cf6534af03b27e28d10.tar.gz
ARM: Merge for-2635-4/spi-devs
Merge branch 'for-2635-4/spi-devs' into for-2635-4/partial2 Conflicts: arch/arm/mach-s5pc100/include/mach/map.h arch/arm/mach-s5pv210/Makefile
Diffstat (limited to 'arch/arm/mach-s3c64xx/mach-smartq7.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud