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 /fs/jbd2/commit.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 (diff) | |
| parent | Revert "[WATCHDOG] hpwdt: Fix NMI handling." (diff) | |
| download | linux-dev-a8051fde6b71ac9a0e63c861c81c59ba776175f9.tar.xz linux-dev-a8051fde6b71ac9a0e63c861c81c59ba776175f9.zip | |
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 'fs/jbd2/commit.c')
0 files changed, 0 insertions, 0 deletions