aboutsummaryrefslogtreecommitdiff
path: root/include/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-06-18 13:14:10 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-06-18 13:14:10 -0700
commit9e3e4b1d2d13bead8d52703c82a02b55f108b491 (patch)
tree69d725323a2da43a571eb218beb7c55fa39f1ff2 /include/net
parentdcce284a259373f9e5570f2e33f79eca84fcf565 (diff)
parent47bece87b14b866872b52ff04d469832e4936756 (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: Add NMI sourcing [WATCHDOG] iTCO_wdt: Fix ICH7+ reboot issue. [WATCHDOG] iTCO_wdt: fix memory corruption when RCBA is disabled by hardware [WATCHDOG] Correct WDIOF_MAGICCLOSE flag [WATCHDOG] move platform probe and remove function to devinit and devexit [WATCHDOG] Some more general cleanup [WATCHDOG] iTCO_wdt: Cleanup code
Diffstat (limited to 'include/net')
0 files changed, 0 insertions, 0 deletions