diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-09 22:33:02 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-09 22:33:02 +0200 |
| commit | 3f30a09a612bac2b531a206c2a58a292dd7ff182 (patch) | |
| tree | 62741c2f78aeb3009c66dbcf014ebff2e034e597 /drivers/block | |
| parent | Merge branch 'at91' into devel (diff) | |
| parent | [ARM] 5239/1: Palm Zire 72 power management support (diff) | |
| download | linux-3f30a09a612bac2b531a206c2a58a292dd7ff182.tar.xz linux-3f30a09a612bac2b531a206c2a58a292dd7ff182.zip | |
Merge branch 'pxa-all' into devel
Conflicts:
arch/arm/mach-pxa/Kconfig
arch/arm/mach-pxa/corgi.c
arch/arm/mach-pxa/include/mach/hardware.h
arch/arm/mach-pxa/spitz.c
Diffstat (limited to 'drivers/block')
0 files changed, 0 insertions, 0 deletions