projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0575db8 fb62db2)
Merge branch 'futexes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 21 Oct 2010 21:06:17 +0000 (14:06 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 21 Oct 2010 21:06:17 +0000 (14:06 -0700)
commitb61f6a57f1919ef8dbd33f864df9b8b361c65b11
tree9341bc1a3f6a8fdcd19f97d5bcf1a658ab7fc92ctree | snapshot
parent0575db881d18a4791013fc93ba756ad08b18fb48commit | diff
parentfb62db2ba943b1683f1d7181bb2988fce4c60870commit | diff
Merge branch 'futexes-for-linus' of git://git./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*
kernel/futex.c diff1 | diff2 | blob | history
John Crispins staging tree