Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 17 Feb 2009 22:07:18 +0000 (14:07 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 17 Feb 2009 22:07:18 +0000 (14:07 -0800)
commit68cc8301b45dee5de275a477a60f77f5560c8ca0
tree022a6c9dd2c1a20d8e7fd415e62d9a8b55337201
parent11df5864075f763ec0d1fdecd6a3f0af7d09a553
parent12d60e28bed3f593aac5385acbdbb089eb8ae21e
Merge git://git./linux/kernel/git/wim/linux-2.6-watchdog

* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
  [WATCHDOG] iTCO_wdt: fix SMI_EN regression 2