diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-14 10:15:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-14 10:15:43 -0700 |
| commit | 786c58b7275ae885a3cee9d5bcf8721d962861ac (patch) | |
| tree | 40997a988f66d449ff02f5c22853526aac35d773 /fs/nfs | |
| parent | 1eafbfeb7bdf59cfe173304c76188f3fd5f1fd05 (diff) | |
| parent | b77b708868c23737a4d25a474736cc924deb44f1 (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: eliminate section mismatch warning
watchdog: w83697ug_wdt: Fix set bit 0 to activate GPIO2
watchdog: sch311x_wdt: fix printk condition
watchdog: sch311x_wdt: Fix LDN active check
watchdog: cpwd: Fix buffer-overflow
Diffstat (limited to 'fs/nfs')
0 files changed, 0 insertions, 0 deletions