From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 4 Apr 2010 19:12:19 +0000 (-0700)
Subject: Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: firefly_0821_release~9833^2~2437
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a8941b0ed0f1e39a4d41560c3a2e7ee37d5b6e10;p=firefly-linux-kernel-4.4.55.git

Merge branch 'tracing-fixes-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  ring-buffer: Add missing unlock
  tracing: Fix lockdep warning in global_clock()
---

a8941b0ed0f1e39a4d41560c3a2e7ee37d5b6e10