From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 12 Jun 2009 07:53:47 +0000 (+0200)
Subject: asm-generic: merge branch 'master' of torvalds/linux-2.6
X-Git-Tag: v2.6.31-rc1~355^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5b02ee3d219f9e01b6e9146e25613822cfc2e5ce;p=pandora-kernel.git

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>
---

5b02ee3d219f9e01b6e9146e25613822cfc2e5ce
Reading git-diff-tree failed