| commit | 8e2376ab1086b2bff18fdb887f5bc13740ae6e24 | [log] [tgz] |
|---|---|---|
| author | Ben Dooks <ben-linux@fluff.org> | Tue Jan 19 17:42:02 2010 +0900 |
| committer | Ben Dooks <ben-linux@fluff.org> | Tue Jan 19 17:42:02 2010 +0900 |
| tree | b151540007af3aa260418c1519a5c69b56450025 | |
| parent | 71269364a8d5ea42ecc6cbc7b687e5d45cbabe0e [diff] | |
| parent | bcedfa98d97e02e95bb023ab93675dbe63c508ef [diff] |
ARM: Merge next-samsung-mc-adc Merge branch 'next-samsung-mc-adc' into next-samsung-try5 Conflicts: arch/arm/mach-s3c6400/include/mach/map.h (fix ADC and RTC merge)