diff options
| author |   Ben Dooks <ben-linux@fluff.org> | 2010-01-19 17:42:02 +0900 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-01-19 17:42:02 +0900 |
| commit | 8e2376ab1086b2bff18fdb887f5bc13740ae6e24 (patch) | |
| tree | b151540007af3aa260418c1519a5c69b56450025 /scripts | |
| parent | ARM: S3C64XX: Add I2S resources in platform code (diff) | |
| parent | ARM: S3C64XX: Add S3C64XX support to the generic Samsung ADC driver (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)
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions