linux

Author	SHA1	Message	Date
David Woodhouse	742c52533b	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 Conflicts: include/asm-arm/arch-omap/onenand.h	2008-08-12 11:28:00 +01:00
Russell King	a09e64fbc0	[ARM] Move include/asm-arm/arch-* to arch/arm//include/mach This just leaves include/asm-arm/plat- to deal with. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>	2008-08-07 09:55:48 +01:00