asm-generic: merge branch 'master' of torvalds/linux-2.6
authorArnd Bergmann <arnd@arndb.de>
Fri, 12 Jun 2009 07:53:47 +0000 (09:53 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 12 Jun 2009 09:32:58 +0000 (11:32 +0200)
commit5b02ee3d219f9e01b6e9146e25613822cfc2e5ce
tree7ce9126738c3cf4b37d67170d0e4b34818c057a9
parent26a28fa4fea5b8c65713aa50c124f76a88c7924d
parent8ebf975608aaebd7feb33d77f07ba21a6380e086
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>
arch/frv/include/asm/pci.h
arch/sh/include/asm/atomic.h
arch/x86/include/asm/atomic_32.h
include/asm-generic/atomic-long.h
lib/Makefile