| commit | 7ef4de17cc55a3c3b8d093743b1e3b845d8eba47 | [log] [tgz] |
|---|---|---|
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | Fri Nov 28 15:39:02 2008 +0000 |
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | Fri Nov 28 15:39:02 2008 +0000 |
| tree | adf87c996affbb6c42850d55cb34c0e5a2f6d340 | |
| parent | f412b09f4ed7c57f5b8935ed7d6fc786f402a629 [diff] | |
| parent | b5ee9002583fc14e6d45a04c18f208987a8fbced [diff] |
Merge branch 'highmem' into devel Conflicts: arch/arm/mach-clps7500/include/mach/memory.h