tree 77f1bc9c635e2ac29396816ce9ef9cbdb6853884
parent 3f6280ddf25fa656d0e17960588e52bee48a7547
parent 04dce7d9d429ea5ea04e9432d1726c930f4d67da
author Linus Torvalds <torvalds@linux-foundation.org> 1244675980 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1244675980 -0700

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

* 'locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  spinlock: Add missing __raw_spin_lock_flags() stub for UP
  mutex: add atomic_dec_and_mutex_lock(), fix
  locking, rtmutex.c: Documentation cleanup
  mutex: add atomic_dec_and_mutex_lock()