]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
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)
commit7a20655bc5316ccec0f036cde46e609ba5571f5e
treec61933e48a85737b8279512d661357d6bb83ea4c
parente6c9f716ba91c1e065b75949f643383d1888bed5
parent150ed8ed63b96d7f93ef7e6081797aa0df2b1abd
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] sc1200wdt.c pnp unregister fix.