From: Linus Torvalds Date: Sat, 4 Apr 2009 00:29:53 +0000 (-0700) Subject: Merge branch 'locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: firefly_0821_release~14791 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=492f59f526d95e73028f57bff475b4bbe3c8cb72;p=firefly-linux-kernel-4.4.55.git Merge branch 'locking-for-linus' of git://git./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: locking: rename trace_softirq_[enter|exit] => lockdep_softirq_[enter|exit] lockdep: remove duplicate CONFIG_DEBUG_LOCKDEP definitions lockdep: require framepointers for x86 lockdep: remove extra "irq" string lockdep: fix incorrect state name --- 492f59f526d95e73028f57bff475b4bbe3c8cb72