tree 3b14f9abef903f70dbd48540cebb1da041cc01ac
parent 5e30302b9ee75a01d65d8dcf4085254a5da1066d
parent 33015c85995716d03f6293346cf05a1908b0fb9a
author Linus Torvalds <torvalds@linux-foundation.org> 1241550482 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1241550482 -0700

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: x86, mmiotrace: fix range test
  tracing: fix ref count in splice pages