commit | f8effd1a4a1833eac90261d78abacfaefe3d99e4 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Feb 17 14:29:15 2009 -0800 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Feb 17 14:29:15 2009 -0800 |
tree | 8ebecce9f6d5b0faf0efc3828b3b353561fd9341 | |
parent | 35010334aa007480a833401b80922299cb1a15ef [diff] | |
parent | f9aa28adfc6a4b01268ebb6d88566cca8627905f [diff] |
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