From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 31 Mar 2012 20:32:30 +0000 (-0700)
Subject: Merge tag 'parisc-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6
X-Git-Tag: v3.4-rc1~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=adb3b1f3fc1c6edb501808ebf80a81e81c52eb73;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge tag 'parisc-misc' of git://git./linux/kernel/git/jejb/parisc-2.6

Pull PARISC misc updates from James Bottomley:
 "This is a couple of minor updates (fixing lws futex locking and
  removing some obsolete cpu_*_map calls)."

* tag 'parisc-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6:
  [PARISC] remove references to cpu_*_map.
  [PARISC] futex: Use same lock set as lws calls
---

adb3b1f3fc1c6edb501808ebf80a81e81c52eb73