Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 11 Nov 2009 19:27:49 +0000 (11:27 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 11 Nov 2009 19:27:49 +0000 (11:27 -0800)
commit7bbf8ef6902d1e0102a91d22c035622443fd20ca
tree5bdb356bfe2c69fb4deb2801568157c15a9e6aec
parent1ed23743077019e7790234c58e9af678664581df
parent1efd374d78834a793663414402911765bcdda6eb
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] SBC-FITPC2 watchdog driver registration fix