diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-03-25 22:08:55 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-03-25 22:08:55 +0000 |
| commit | 0003cedfc577be9d679c16531f8720739e9637ed (patch) | |
| tree | 3b7a1e9087384706c8320f85f650ab96139e8c00 /arch/arm/kernel/traps.c | |
| parent | 3ee357f0f38a5fddebab18500c290d3879a2d89c (diff) | |
| parent | c76b6b41d0ae29e1127d9f81cb687cabda57c14c (diff) | |
Merge nommu tree
Fix merge conflict in arch/arm/mm/proc-xscale.S
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel/traps.c')
0 files changed, 0 insertions, 0 deletions