Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6
commit455ce9d8410d381f56a1676449a723ca1985b369
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 4 Aug 2011 16:36:20 +0000 (4 06:36 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 4 Aug 2011 16:36:20 +0000 (4 06:36 -1000)
tree05ab694a3529958cf917214cfa3dd47b09dc1a2b
parent447e1363bc2cc80fa9205a51a4f86d83c35b54a4
parent205e9a2106b934ea39049bab28f0896c17a2cb30
Merge branch 'fixes' of git://git./linux/kernel/git/jejb/parisc-2.6

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6:
  [PARISC] wire up sendmmsg syscall
  [PARISC] fix return type of __atomic64_add_return
  [PARISC] Fix futex support
arch/parisc/include/asm/atomic.h