diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-11-28 16:39:02 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-11-28 16:39:02 +0100 |
| commit | 7ef4de17cc55a3c3b8d093743b1e3b845d8eba47 (patch) | |
| tree | adf87c996affbb6c42850d55cb34c0e5a2f6d340 /arch/arm/mach-pxa/spitz_pm.c | |
| parent | Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6 into devel (diff) | |
| parent | [ARM] remove a common set of __virt_to_bus definitions (diff) | |
| download | linux-7ef4de17cc55a3c3b8d093743b1e3b845d8eba47.tar.xz linux-7ef4de17cc55a3c3b8d093743b1e3b845d8eba47.zip | |
Merge branch 'highmem' into devel
Conflicts:
arch/arm/mach-clps7500/include/mach/memory.h
Diffstat (limited to 'arch/arm/mach-pxa/spitz_pm.c')
0 files changed, 0 insertions, 0 deletions