| commit | 1e8ff636beb6ee5c87868a6081cc4f95b1ccd713 | [log] [tgz] |
|---|---|---|
| author | Ben Dooks <ben-linux@fluff.org> | Wed May 19 18:05:15 2010 +0900 |
| committer | Ben Dooks <ben-linux@fluff.org> | Wed May 19 18:05:15 2010 +0900 |
| tree | 5a6be34a53bf640c035d642b4d19388d6a7fd6cc | |
| parent | 32457942b90aabb9242b450f02d18d9c8d982916 [diff] | |
| parent | 7d1a2077a7e519fc0c68617526abea3f72632e60 [diff] |
ARM: Merge for-2635/s5p-dma Merge branch 'for-2635/s5p-dma' into for-linus/samsung2 Conflicts: arch/arm/mach-s5pv210/Makefile