From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 3 Mar 2009 22:32:37 +0000 (-0800)
Subject: Merge branch 'tracing/mmiotrace' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v2.6.29-rc7~4
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f2a4165526a9746afc4ba5413b1756614a49d450;p=karo-tx-linux.git

Merge branch 'tracing/mmiotrace' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'tracing/mmiotrace' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86 mmiotrace: fix race with release_kmmio_fault_page()
  x86 mmiotrace: improve handling of secondary faults
  x86 mmiotrace: split set_page_presence()
  x86 mmiotrace: fix save/restore page table state
  x86 mmiotrace: WARN_ONCE if dis/arming a page fails
  x86: add far read test to testmmiotrace
  x86: count errors in testmmiotrace.ko
---

f2a4165526a9746afc4ba5413b1756614a49d450