summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds2012-03-31 22:32:30 +0200
committerLinus Torvalds2012-03-31 22:32:30 +0200
commitadb3b1f3fc1c6edb501808ebf80a81e81c52eb73 (patch)
tree9490e03ee23abda6a42cc0070aec5494c18ce9bf /kernel
parentMerge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/s... (diff)
parent[PARISC] remove references to cpu_*_map. (diff)
downloadkernel-qcow2-linux-adb3b1f3fc1c6edb501808ebf80a81e81c52eb73.tar.gz
kernel-qcow2-linux-adb3b1f3fc1c6edb501808ebf80a81e81c52eb73.tar.xz
kernel-qcow2-linux-adb3b1f3fc1c6edb501808ebf80a81e81c52eb73.zip
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
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions