tree 7ce9126738c3cf4b37d67170d0e4b34818c057a9
parent 26a28fa4fea5b8c65713aa50c124f76a88c7924d
parent 8ebf975608aaebd7feb33d77f07ba21a6380e086
author Arnd Bergmann <arnd@arndb.de> 1244793227 +0200
committer Arnd Bergmann <arnd@arndb.de> 1244799178 +0200

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>