aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/usb
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-05-25 14:59:59 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-05-25 14:59:59 -0700
commitc8ff99a7c2fb23a0f1165f3821fd66fd65f30264 (patch)
tree92c785d5ab40f9b8c3d4dc899e88673502c993cf /drivers/net/usb
parent32522bfdaed094e447f71cce68c349847ae9c7d5 (diff)
parenta49056da0325742d3b4f5d1ef7bf8ab0690c3888 (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] Add ICH9DO into the iTCO_wdt.c driver [WATCHDOG] Fix booke_wdt.c on MPC85xx SMP system's [WATCHDOG] Add a watchdog driver based on the CS5535/CS5536 MFGPT timers [WATCHDOG] hpwdt: Fix NMI handling. [WATCHDOG] Blackfin Watchdog Driver: split platform device/driver [WATCHDOG] Add w83697h_wdt early_disable option [WATCHDOG] Make w83697h_wdt timeout option string similar to others [WATCHDOG] Make w83697h_wdt void-like functions void
Diffstat (limited to 'drivers/net/usb')
0 files changed, 0 insertions, 0 deletions