diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-18 12:55:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-18 12:55:00 -0700 |
| commit | a8051fde6b71ac9a0e63c861c81c59ba776175f9 (patch) | |
| tree | f6451c14bca538e01ec4a364f5f628870322181e /drivers/scsi/ppa.h | |
| parent | 5dfd06215b951de70b3e610de47813811c822a44 (diff) | |
| parent | fdf7be6f13b920f0d80c249c70f794a2f6d53992 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
Revert "[WATCHDOG] hpwdt: Fix NMI handling."
[WATCHDOG] hpwdt: Add CFLAGS to get driver working
Revert "[WATCHDOG] make watchdog/hpwdt.c:asminline_call() static"
Diffstat (limited to 'drivers/scsi/ppa.h')
0 files changed, 0 insertions, 0 deletions