diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 05:07:25 -0400 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 05:07:25 -0400 |
| commit | 14b8a0f92b309ff452a8c339abd9a096d00b210f (patch) | |
| tree | 0472637882c576873aae00207a07f9d178cdebd7 /arch/arm/plat-s5p | |
| parent | 05a690d2db5bd57d3c94293b06b69158535835df (diff) | |
| parent | adc0950c08e1f433f6933759f4facf9b2cf8d29d (diff) | |
ARM: Merge for-2635/samsung-rtc
Merge branch 'for-2635/samsung-rtc' into for-linus/samsung2
Conflicts:
arch/arm/mach-s3c64xx/include/mach/map.h
arch/arm/plat-samsung/Kconfig
arch/arm/plat-samsung/Makefile
Diffstat (limited to 'arch/arm/plat-s5p')
0 files changed, 0 insertions, 0 deletions