Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 17 Feb 2009 22:29:15 +0000 (14:29 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 17 Feb 2009 22:29:15 +0000 (14:29 -0800)
commitf8effd1a4a1833eac90261d78abacfaefe3d99e4
tree8ebecce9f6d5b0faf0efc3828b3b353561fd9341
parent35010334aa007480a833401b80922299cb1a15ef
parentf9aa28adfc6a4b01268ebb6d88566cca8627905f
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:
  doc: mmiotrace.txt, buffer size control change
  trace: mmiotrace to the tracer menu in Kconfig
  mmiotrace: count events lost due to not recording