| commit | b61f6a57f1919ef8dbd33f864df9b8b361c65b11 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Oct 21 14:06:17 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Oct 21 14:06:17 2010 -0700 |
| tree | 9341bc1a3f6a8fdcd19f97d5bcf1a658ab7fc92c | |
| parent | 0575db881d18a4791013fc93ba756ad08b18fb48 [diff] | |
| parent | fb62db2ba943b1683f1d7181bb2988fce4c60870 [diff] |
Merge branch 'futexes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'futexes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: futex: Fix kernel-doc notation & typos futex: Add lock context annotations futex: Mark restart_block.futex.uaddr[2] __user futex: Change 3rd arg of fetch_robust_entry() to unsigned int*