| commit | 5b02ee3d219f9e01b6e9146e25613822cfc2e5ce | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Fri Jun 12 09:53:47 2009 +0200 |
| committer | Arnd Bergmann <arnd@arndb.de> | Fri Jun 12 11:32:58 2009 +0200 |
| tree | 7ce9126738c3cf4b37d67170d0e4b34818c057a9 | |
| parent | 26a28fa4fea5b8c65713aa50c124f76a88c7924d [diff] | |
| parent | 8ebf975608aaebd7feb33d77f07ba21a6380e086 [diff] |
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>