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>
This commit is contained in:
Arnd Bergmann 2009-06-12 09:53:47 +02:00
commit 5b02ee3d21
1459 changed files with 102155 additions and 35960 deletions

Some files were not shown because too many files have changed in this diff Show more