tree 8ebecce9f6d5b0faf0efc3828b3b353561fd9341
parent 35010334aa007480a833401b80922299cb1a15ef
parent f9aa28adfc6a4b01268ebb6d88566cca8627905f
author Linus Torvalds <torvalds@linux-foundation.org> 1234909755 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1234909755 -0800

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:
  doc: mmiotrace.txt, buffer size control change
  trace: mmiotrace to the tracer menu in Kconfig
  mmiotrace: count events lost due to not recording