OSDN Git Service

Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
authorLinus Torvalds <torvalds@g5.osdl.org>
Sun, 29 Oct 2006 21:53:05 +0000 (13:53 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sun, 29 Oct 2006 21:53:05 +0000 (13:53 -0800)
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
  [WATCHDOG] sc1200wdt.c pnp unregister fix.


Trivial merge