diff options
| author |   Ben Dooks <ben-linux@fluff.org> | 2010-05-19 18:05:15 +0900 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 18:05:15 +0900 |
| commit | 1e8ff636beb6ee5c87868a6081cc4f95b1ccd713 (patch) | |
| tree | 5a6be34a53bf640c035d642b4d19388d6a7fd6cc /drivers/acpi/debug.c | |
| parent | ARM: Merge for-2635/fb-updates1 (diff) | |
| parent | S5PV210: DMA: Add platform devices for PL330 DMACs (diff) | |
| download | linux-dev-1e8ff636beb6ee5c87868a6081cc4f95b1ccd713.tar.xz linux-dev-1e8ff636beb6ee5c87868a6081cc4f95b1ccd713.zip | |
ARM: Merge for-2635/s5p-dma
Merge branch 'for-2635/s5p-dma' into for-linus/samsung2
Conflicts:
arch/arm/mach-s5pv210/Makefile
Diffstat (limited to 'drivers/acpi/debug.c')
0 files changed, 0 insertions, 0 deletions