| commit | f2a4165526a9746afc4ba5413b1756614a49d450 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Tue, 3 Mar 2009 22:32:37 +0000 (3 14:32 -0800) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Tue, 3 Mar 2009 22:32:37 +0000 (3 14:32 -0800) | ||
| tree | d5cdf4ee27f77bfbfcb133666a538670accc9a57 | treesnapshot (tar.gz zip) |
| parent | b24746c7be75384d182845375c96433d713981bb | commitdiff |
| parent | 340430c572f7b2b275d39965e88bafa71693cb23 | commitdiff |
Merge branch 'tracing/mmiotrace' of git://git./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
* '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