diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-31 13:32:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-31 13:32:30 -0700 |
| commit | adb3b1f3fc1c6edb501808ebf80a81e81c52eb73 (patch) | |
| tree | 9490e03ee23abda6a42cc0070aec5494c18ce9bf /kernel/trace/Kconfig | |
| parent | a75ee6ecd411a50bf4da927c2fdb2cb56246a2bd (diff) | |
| parent | 7ec6118c46699548b302149bba791166004c8428 (diff) | |
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/trace/Kconfig')
0 files changed, 0 insertions, 0 deletions