diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-11 13:16:22 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-11 13:16:22 -0700 |
commit | 7193bea53f9d9730bbc859777c2f86c76349914d (patch) | |
tree | c841e3d256d63bf30cd4acc4751d9213c0ba7dff /arch/ia64/include/asm/dma-mapping.h | |
parent | 989aa44a5f215427085ccfe65c1e378e3399c9eb (diff) | |
parent | 84bc4af59081ee974dd80210e694ab59ebe51ce8 (diff) |
Merge branch 'core-futexes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-futexes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
futex: Detect mismatched requeue targets
futex: Correct futex_wait_requeue_pi() commentary
Diffstat (limited to 'arch/ia64/include/asm/dma-mapping.h')
0 files changed, 0 insertions, 0 deletions