diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-12 11:51:32 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-12 11:51:32 -0700 |
commit | 94a9f8ad337aec011da2ca901ef89ae7e885f24c (patch) | |
tree | 755d75783ca7c0e3e3ea49ac42cda720d7d887c9 /drivers/memstick | |
parent | cbf7e9490ea3d1680362b4be3a7809042d493617 (diff) | |
parent | 6d0f0dfdbc8bdb0c52759224b0d423c35f828397 (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] orion5x_wdt.c: add spinlocking
[WATCHDOG] Orion: add hardware watchdog support
[WATCHDOG] omap_wdt.c: cleanup a bit omap_wdt.c
[WATCHDOG] omap_wdt.c: another ioremap() fix
[WATCHDOG] omap_wdt.c: sync linux-omap changes
[WATCHDOG] Add AT91SAM9X watchdog
[WATCHDOG] Add driver for winbond w83697ug/uf watchdog feature
[WATCHDOG] add watchdog driver IT8716 IT8726 IT8712J/K
Diffstat (limited to 'drivers/memstick')
0 files changed, 0 insertions, 0 deletions