Merge nommu tree
Russell King [Tue, 28 Mar 2006 21:05:10 +0000 (22:05 +0100)]
1  2 
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/kernel/head.S
arch/arm/kernel/traps.c

Simple merge
Simple merge
Simple merge
Simple merge