tree cf1a15d5dfc7e1552c12b4a3ec04fa9ee92581ef
parent d82ef020cf31504c816803b1def94eb5ff173363
parent 292f60c0c4ab44aa2d589ba03c12e64a3b3c5e38
author Linus Torvalds <torvalds@linux-foundation.org> 1270408339 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1270408339 -0700

Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/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()