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

inflate: refactor inflate malloc code

2008-07-25 10:53:28 -07:00

include/asm

asm-generic: rename page.h and uaccess.h

2009-06-11 21:02:17 +02:00

kernel

Push BKL into do_mount()

2009-06-11 21:36:08 -04:00

lib

remove __attribute_used__

2008-01-28 23:21:18 +01:00

math-emu

alpha: fix conversion from denormal float to double

2008-01-17 15:38:59 -08:00

mm

alpha: exception table sorting

2009-05-02 15:36:10 -07:00

oprofile

oprofile: more whitespace fixes

2008-10-15 20:55:51 +02:00

defconfig

alpha/parisc: remove config variable DEBUG_RWLOCK

2008-02-06 10:41:03 -08:00

Kconfig

alpha: use syscall wrappers

2009-01-29 18:04:44 -08:00

Kconfig.debug

alpha/parisc: remove config variable DEBUG_RWLOCK

2008-02-06 10:41:03 -08:00

Makefile

alpha: link failure fix

2008-06-20 16:46:10 -07:00