Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 2 Dec 2010 20:11:31 +0000 (12:11 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 2 Dec 2010 20:11:31 +0000 (12:11 -0800)
commit2e5c26de1d9a8e824b6c098ee393edac1b6050f9
treee42519cc9eb67209be3de6b38ac44bafa4dd1cb6
parent75318ec3277d1fc46ecc129d7ef880b269fd9ee0
parent4fc3680894ff5739e7474b6633e962bfbdf0d3d8
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: it8712f_wdt: add note to Kconfig
  watchdog: gef_wdt: include fs.h
  watchdog: bcm63xx_wdt: improve platform part.
  watchdog: iTCO_wdt: TCO Watchdog patch for Intel Patsburg PCH