diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-26 15:48:11 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-26 15:48:11 -0700 |
commit | 8690d8a9f6c2d5728a9c9f68231f1bb4de109e3a (patch) | |
tree | 175067bf67d29c75f310a1bb76d8429f579d8e9a /drivers/net/tokenring/tmspci.c | |
parent | d3f12d36f148f101c568bdbce795e41cd9ceadf3 (diff) | |
parent | 3b9d49eea1c32e529fa932670a53358e1c8cd67e (diff) | |
download | blackbird-op-linux-8690d8a9f6c2d5728a9c9f68231f1bb4de109e3a.tar.gz blackbird-op-linux-8690d8a9f6c2d5728a9c9f68231f1bb4de109e3a.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] i6300esb.c: start locking
[WATCHDOG] i6300esb.c: convert to platform device driver
[WATCHDOG] wdt.c: remove #ifdef CONFIG_WDT_501
[WATCHDOG] Fix io.h & uaccess.h includes.
[WATCHDOG] More coding-style and trivial clean-up
[WATCHDOG] struct file_operations should be const
[WATCHDOG] cpwd.c: Coding style - Clean-up
[WATCHDOG] hpwdt.c: Add new HP BMC controller.
[PATCH 13/13] drivers/watchdog: use USB API functions rather than constants
[WATCHDOG] orion5x_wdt: fix compile issue by providing tclk as platform data
[WATCHDOG] rc32434_wdt: make sure watchdog is not running at startup
[WATCHDOG] rc32434_wdt: add spin_locking
[WATCHDOG] rc32434_wdt: add shutdown method
[WATCHDOG] rc32434_wdt: add timeout module parameter
[WATCHDOG] rc32434_wdt: clean-up driver
[WATCHDOG] davinci: convert to ioremap() + io[read|write]
[WATCHDOG] w83697ug: add error checking
[WATCHDOG] cpwd.c & riowd.c - unlocked_ioctl
Diffstat (limited to 'drivers/net/tokenring/tmspci.c')
0 files changed, 0 insertions, 0 deletions