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

..

boot

FRV: Drop 'TOPDIR' from Makefiles

2008-01-28 23:14:37 +01:00

include/asm

asm-generic: merge branch 'master' of torvalds/linux-2.6

2009-06-12 11:32:58 +02:00

kernel

FRV: Implement new-style ptrace

2009-06-11 09:01:26 -07:00

lib

move frv docs one level up

2008-02-03 15:54:28 +02:00

mb93090-mb00

FRV: BUG to BUG_ON changes

2009-06-11 09:01:26 -07:00

mm

FRV: Fix compile breakage

2009-04-06 14:31:26 -07:00

defconfig

[PATCH] FRV: Add defconfig

2005-07-07 18:23:42 -07:00

Kconfig

FRV: Implement new-style ptrace

2009-06-11 09:01:26 -07:00

Kconfig.debug

[PATCH] frv: drop unsupported debugging features

2006-01-08 20:13:36 -08:00

Makefile

kbuild: enable 'make AFLAGS=...' to add additional options to AS

2007-10-15 21:59:31 +02:00