Arnd Bergmann 5b02ee3d21 asm-generic: merge branch 'master' of torvalds/linux-2.6 ... Fixes a merge conflict against the x86 tree caused by a fix to atomic.h which I renamed to atomic_long.h. Signed-off-by: Arnd Bergmann <arnd@arndb.de>		2009-06-12 11:32:58 +02:00
..
asm	asm-generic: merge branch 'master' of torvalds/linux-2.6	2009-06-12 11:32:58 +02:00
cpu-common/cpu	…
cpu-sh2/cpu	…
cpu-sh2a/cpu	…
cpu-sh3/cpu	…
cpu-sh4/cpu	sh: sh7722 mode pin definitions	2009-06-11 09:09:19 +03:00
cpu-sh5/cpu	…
mach-common/mach	…
mach-dreamcast/mach	…
mach-landisk/mach	…
mach-se/mach	…
mach-sh03/mach	…