Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 29 Jul 2010 22:21:44 +0000 (15:21 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 29 Jul 2010 22:21:44 +0000 (15:21 -0700)
commit7d5fcdc38ff0425ff52bffe26d481ea07547574c
treed4dc2e778ea8672775aa969984f962917e5a03fc
parente271e872a8685be8e13fe006f0d81630f65d7e5c
parent230a5cef48158221e3f5ae030fef1cf4512401e1
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: update MAINTAINERS entry