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
..
arch-v10	CRIS: Wire up syscalls signalfd4 to writev.	2009-04-28 17:53:35 +02:00
arch-v32	Merge branch 'linus' into irq/numa	2009-06-01 21:06:21 +02:00
boot	CRIS: Merge machine dependent boot/compressed and boot/rescue	2009-04-21 11:44:57 +02:00
configs	CRIS: proper defconfig setup	2008-10-13 21:34:55 +02:00
include	asm-generic: rename page.h and uaccess.h	2009-06-11 21:02:17 +02:00
kernel	Merge branch 'for-linus' of git://repo.or.cz/cris-mirror	2009-04-05 11:36:31 -07:00
mm	BUG to BUG_ON changes	2009-04-02 13:56:04 +02:00
Kconfig	trivial: fix typos/grammar errors in Kconfig texts	2009-03-30 15:22:01 +02:00
Kconfig.debug	[PATCH] arch/cris/Kconfig.debug: use lib/Kconfig.debug	2005-09-05 00:06:19 -07:00
Makefile	CRIS: Merge machine dependent boot/compressed and boot/rescue	2009-04-21 11:44:57 +02:00