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	sh: Allow SH-3 and SH-5 to use common headers.	2008-07-29 22:52:49 +09:00
cpu-sh2/cpu	SH2(A) cache update	2008-08-04 16:33:47 +09:00
cpu-sh2a/cpu	sh: Fix UBC setup and registers for SH2A	2009-05-09 00:09:21 +09:00
cpu-sh3/cpu	sh: remove old TMU driver	2009-05-12 19:53:14 +09:00
cpu-sh4/cpu	sh: sh7722 mode pin definitions	2009-06-11 09:09:19 +03:00
cpu-sh5/cpu	sh: Kill off unused SH-5 irq_describe cruft.	2009-05-07 18:17:20 +09:00
mach-common/mach	sh: sh7785lcr: fix I2C device address map for 32-bit mode	2009-05-11 16:56:16 +09:00
mach-dreamcast/mach	sh: pci: Tidy up the dreamcast PCI support.	2009-04-20 20:22:05 +09:00
mach-landisk/mach	sh: migrate to arch/sh/include/	2008-07-29 08:09:44 +09:00
mach-se/mach	sh: Add ms7724se (SH7724) board support	2009-05-26 17:01:47 +09:00
mach-sh03/mach	sh: migrate to arch/sh/include/	2008-07-29 08:09:44 +09:00