| commit | 0003cedfc577be9d679c16531f8720739e9637ed | [log] [tgz] |
|---|---|---|
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | Sat Mar 25 22:08:55 2006 +0000 |
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | Sat Mar 25 22:08:55 2006 +0000 |
| tree | 3b7a1e9087384706c8320f85f650ab96139e8c00 | |
| 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>