diff options
| author |   Frederic Weisbecker <fweisbec@gmail.com> | 2010-05-12 23:19:01 +0200 |
|---|---|---|
| committer | Frederic Weisbecker <fweisbec@gmail.com> | 2010-05-12 23:20:33 +0200 |
| commit | a9aa1d02de36b450990b0e25a88fc2ff1c3e6b94 (patch) | |
| tree | 1f9d19f1642d263e65906a916a48be9339accc73 /include/linux/nmi.h | |
| parent | nmi_watchdog: Tell the world we're active (diff) | |
| parent | Linux 2.6.34-rc7 (diff) | |
| download | linux-dev-a9aa1d02de36b450990b0e25a88fc2ff1c3e6b94.tar.xz linux-dev-a9aa1d02de36b450990b0e25a88fc2ff1c3e6b94.zip | |
Merge commit 'v2.6.34-rc7' into perf/nmi
Merge reason: catch up with latest softlockup detector changes.
Diffstat (limited to 'include/linux/nmi.h')
0 files changed, 0 insertions, 0 deletions