From: Linus Torvalds Date: Sat, 5 Dec 2009 17:49:59 +0000 (-0800) Subject: Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Tag: v2.6.33-rc1~407 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3e72b810e30cdf4655279dd767eb798ac7a8fe5e;p=pandora-kernel.git Merge branch 'core-locking-for-linus' of git://git./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 --- 3e72b810e30cdf4655279dd767eb798ac7a8fe5e Reading git-diff-tree failed