git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d82ef02 292f60c)
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)
* '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()


Trivial merge
Pandora Kernel Repository