| commit | 45c8fa878475b16467109cf6534af03b27e28d10 | [log] [tgz] |
|---|---|---|
| author | Ben Dooks <ben-linux@fluff.org> | Thu May 20 19:40:24 2010 +0900 |
| committer | Ben Dooks <ben-linux@fluff.org> | Thu May 20 19:40:24 2010 +0900 |
| tree | a7c66c65dbc38774dcbba0d2965b1f851fcc1578 | |
| parent | 84eb9ecce20acfd287ba0d623fe5e99bfab08686 [diff] | |
| parent | ef2f07d31c6b890e0cc3966d4a27fa1d49b740f5 [diff] |
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