diff options
| author |   Ben Dooks <ben-linux@fluff.org> | 2010-05-19 18:07:25 +0900 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 18:07:25 +0900 |
| commit | 14b8a0f92b309ff452a8c339abd9a096d00b210f (patch) | |
| tree | 0472637882c576873aae00207a07f9d178cdebd7 /drivers/acpi/debug.c | |
| parent | ARM: Merge for-2635/samsung-ts (diff) | |
| parent | ARM: SAMSUNG: Move RTC device definitions in plat-samsung (diff) | |
| download | linux-dev-14b8a0f92b309ff452a8c339abd9a096d00b210f.tar.xz linux-dev-14b8a0f92b309ff452a8c339abd9a096d00b210f.zip | |
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 'drivers/acpi/debug.c')
0 files changed, 0 insertions, 0 deletions