tree 05ab694a3529958cf917214cfa3dd47b09dc1a2b
parent 447e1363bc2cc80fa9205a51a4f86d83c35b54a4
parent 205e9a2106b934ea39049bab28f0896c17a2cb30
author Linus Torvalds <torvalds@linux-foundation.org> 1312475780 -1000
committer Linus Torvalds <torvalds@linux-foundation.org> 1312475780 -1000

Merge branch 'fixes' of git://git.kernel.org/pub/scm/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