tree a6c8daae5390b44750dfc4ca9bc984430dd16e74
parent 9b269d4034c7855ac34f0985cc55ee29bd80e80a
parent c08f782985eed9959438368e84ce1d7f2ed03d95
author Linus Torvalds <torvalds@linux-foundation.org> 1260035399 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1260035399 -0800

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

* 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  mutex: Fix missing conditions to build mutex_spin_on_owner()
  mutex: Better control mutex adaptive spinning config
  locking, task_struct: Reduce size on TRACE_IRQFLAGS and 64bit
  locking: Use __[SPIN|RW]_LOCK_UNLOCKED in [spin|rw]_lock_init()
  locking: Remove unused prototype
  locking: Reduce ifdefs in kernel/spinlock.c
  locking: Make inlining decision Kconfig based