| commit | 0084f27a21d36ac846cd4366289c229a7cce511b | [log] [tgz] |
|---|---|---|
| author | Ben Dooks <ben-linux@fluff.org> | Mon Jan 18 09:35:29 2010 +0900 |
| committer | Ben Dooks <ben-linux@fluff.org> | Mon Jan 18 09:35:29 2010 +0900 |
| tree | b151540007af3aa260418c1519a5c69b56450025 | |
| parent | bcedfa98d97e02e95bb023ab93675dbe63c508ef [diff] | |
| parent | 71269364a8d5ea42ecc6cbc7b687e5d45cbabe0e [diff] |
ARM: Merge next-s3c64xx Merge branch 'next-s3c64xx' into next-samsung Conflicts: arch/arm/mach-s3c6400/include/mach/map.h ( ADC and RTC PA merge fixed)