diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-26 23:10:11 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-26 23:10:11 +0000 |
| commit | 542f869f1826f092606efd0c4c771f070d1314f5 (patch) | |
| tree | 9c9d265ab0c87ea7862ccb70933f33d3d7011334 /arch/arm/include/asm/memory.h | |
| parent | e8b374bb6c888a70530d800c9e2fcd153e2c325d (diff) | |
| parent | 839e642f3dda44a35c6a91780bff41d84c288022 (diff) | |
Merge branch 'for-rmk' of git://gitorious.org/linux-gemini/mainline into devel
Conflicts:
arch/arm/mm/Kconfig
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/include/asm/memory.h')
0 files changed, 0 insertions, 0 deletions