diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-05-20 12:40:24 +0200 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-20 12:40:24 +0200 |
| commit | 45c8fa878475b16467109cf6534af03b27e28d10 (patch) | |
| tree | a7c66c65dbc38774dcbba0d2965b1f851fcc1578 /arch/arm/mach-s3c64xx/Makefile | |
| parent | ARM: Merge for-2635-4/s5p-devs (diff) | |
| parent | ARM: S5P6440: Define SPI platform devices (diff) | |
| download | linux-45c8fa878475b16467109cf6534af03b27e28d10.tar.xz linux-45c8fa878475b16467109cf6534af03b27e28d10.zip | |
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/Makefile')
0 files changed, 0 insertions, 0 deletions