git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 26a28fa 8ebf975)
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)
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>

Trivial merge
Pandora Kernel Repository