diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-17 12:48:52 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-17 12:48:52 -0700 |
| commit | efcbae253f97bf82e7befd372da3ad5995a53f1a (patch) | |
| tree | fbbba7dc1af78b341fbaab0bf329d343accff4ea /fs | |
| parent | 54a772b8aace3df8ad6af0bd0748f57d27f72b1d (diff) | |
| parent | f71d26bb6503e9b11b91444819b2f96872baaab8 (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:
watchdog: hpwdt depends on PCI
watchdog: fix hpwdt Kconfig regression in 3.0-rc
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions