summaryrefslogtreecommitdiffstats
path: root/drivers/net/bonding/bond_main.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2008-01-18 14:06:19 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-01-18 14:06:19 -0800
commitc9daa2722a3f1967e3e9750fd4cb6a7352a3cd63 (patch)
treea28c40b8e4f8ee1d653d5add903e03a9be0ede8a /drivers/net/bonding/bond_main.c
parent977c8fa4d75d4ebe7ebbe116eed9e06f780fb34d (diff)
parent0d710cba3afde2109030254ee90654fbb580e8af (diff)
downloadblackbird-op-linux-c9daa2722a3f1967e3e9750fd4cb6a7352a3cd63.tar.gz
blackbird-op-linux-c9daa2722a3f1967e3e9750fd4cb6a7352a3cd63.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: [WATCHDOG] clarify watchdog operation in documentation [WATCHDOG] Revert "Stop looking for device as soon as one is found"
Diffstat (limited to 'drivers/net/bonding/bond_main.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud