| commit | 206a1a825dc67060ee319c99569755ba11250907 | [log] [tgz] |
|---|---|---|
| author | Ben Dooks <ben-linux@fluff.org> | Thu May 20 20:25:59 2010 +0900 |
| committer | Ben Dooks <ben-linux@fluff.org> | Thu May 20 20:25:59 2010 +0900 |
| tree | e4cdbd7b8b745e0ad4adfd59fa57c3bcabe3daf4 | |
| parent | 6aeaad51aaecc9ebc8c1e8f132655e2ae8141f8c [diff] | |
| parent | 999304be1177d42d16bc59c546228c6ac5a3e76a [diff] |
ARM: Merge for-2635-4/onenand Merge branch 'for-2635-4/onenand' into for-2635-4/partial2 Conflicts: arch/arm/mach-s5pc100/cpu.c arch/arm/mach-s5pc100/include/mach/map.h arch/arm/mach-s5pv210/Makefile