]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'parisc-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 31 Mar 2012 20:32:30 +0000 (13:32 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 31 Mar 2012 20:32:30 +0000 (13:32 -0700)
commit7b4b72740711cc276d3bfd0f96b757142643b89c
tree9490e03ee23abda6a42cc0070aec5494c18ce9bf
parent334a52253ae3568c4cc891b5bfedf60e5549bbf7
parent27676adb6a62e80c4651c9ebc3611446882021a2
Merge tag 'parisc-misc' of git://git.kernel.org/pub/scm/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
arch/parisc/kernel/smp.c