]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 2 Nov 2009 17:45:44 +0000 (09:45 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 2 Nov 2009 17:45:44 +0000 (09:45 -0800)
commit872e2f567c4bd23d1a7daec9caff63919a1bc0e8
tree89dce7d51c11ea56150e4f5613a28369e238f90e
parentc4064d5357ecad7924ce0bd52ad49dcebe35f77c
parenta4b8c1670752e3d359fa77917b2097265f621a57
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:
  tracing: Remove cpu arg from the rb_time_stamp() function
  tracing: Fix comment typo and documentation example
  tracing: Fix trace_seq_printf() return value
  tracing: Update *ppos instead of filp->f_pos