Merge branch 'linus' into x86/urgent
[linux-2.6] / arch / arm / mach-pxa / include / mach / mfp-pxa320.h
2008-08-07  Russell King[ARM] Move include/asm-arm/arch-* to arch/arm/*/include...