Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 4 Apr 2010 19:12:19 +0000 (12:12 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 4 Apr 2010 19:12:19 +0000 (12:12 -0700)
commita8941b0ed0f1e39a4d41560c3a2e7ee37d5b6e10
treecf1a15d5dfc7e1552c12b4a3ec04fa9ee92581ef
parentd82ef020cf31504c816803b1def94eb5ff173363
parent292f60c0c4ab44aa2d589ba03c12e64a3b3c5e38
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()