aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-x86/nmi.h
Commit message (Expand)AuthorAge
* Merge branch 'x86/nmi' into x86/develIngo Molnar2008-07-08
|\
| * x86: nmi - consolidate nmi_watchdog_default for 32bit modeCyrill Gorcunov2008-06-05
| * - fix typo in include/asm-x86/nmi.hIngo Molnar2008-05-30
| * x86: nmi - fix incorrect NMI watchdog used by defaultCyrill Gorcunov2008-05-28
| * x86: nmi_32.c - add nmi_watchdog_default helperCyrill Gorcunov2008-05-25
| * x86: nmi - unify die_nmi() interfaceCyrill Gorcunov2008-05-25
| * x86: remove duplicate declaration of unknown_nmi_panicFernando Luis Vazquez Cao2008-05-25
| |
| \
*-. \ Merge branches 'x86/numa-fixes', 'x86/apic', 'x86/apm', 'x86/bitops', 'x86/bu...Ingo Molnar2008-07-08
|\ \ \ | |_|/ |/| |
| | * x86: remove obsolete PM definitions from NMI headerRafael J. Wysocki2008-06-12
| | * x86: cleanup, remove duplicate declaration of unknown_nmi_panicFernando Luis Vazquez Cao2008-05-25
| |/ |/|
| * x86: NMI watchdog: Downgrade helperMaciej W. Rozycki2008-07-08
|/
* x86: call nmi_watchdog_default in i386Glauber de Oliveira Costa2008-04-17
* x86: unify nmi_32.h and nmi_64.hGlauber de Oliveira Costa2008-04-17
* i386/x86_64: move headers to include/asm-x86Thomas Gleixner2007-10-11