asm-generic: merge branch 'master' of torvalds/linux-2.6 (5b02ee3d) · Commits · github.com / kvm-riscv / linux

Commit 5b02ee3d authored Jun 12, 2009 by

Arnd Bergmann

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>

parents 26a28fa4 8ebf9756

Hide whitespace changes

Inline Side-by-side

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Plain diff Email patch

Please register or to comment