From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 4 Aug 2011 16:36:20 +0000 (-1000)
Subject: Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6
X-Git-Tag: firefly_0821_release~3680^2~4725
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=455ce9d8410d381f56a1676449a723ca1985b369;p=firefly-linux-kernel-4.4.55.git

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
---

455ce9d8410d381f56a1676449a723ca1985b369