Merge branch 'futexes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

* '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*

diff --cc kernel/futex.c
index e328f574c97c02797d7ff06c5cb5862f9368ce4a,9b9fda73ba2efece9ec48328d84ae977163a5758..a118bf160e0b05a4b24404beda19d07adead5161
--- 1/kernel/futex.c
--- 2/kernel/futex.c
+++ b/kernel/futex.c
@@@ -1372,8 -1377,10 +1376,9 @@@ static inline struct futex_hash_bucket 
  
  static inline void
  queue_unlock(struct futex_q *q, struct futex_hash_bucket *hb)
+       __releases(&hb->lock)
  {
        spin_unlock(&hb->lock);
 -      drop_futex_key_refs(&q->key);
  }
  
  /**