tree d4dc2e778ea8672775aa969984f962917e5a03fc
parent e271e872a8685be8e13fe006f0d81630f65d7e5c
parent 230a5cef48158221e3f5ae030fef1cf4512401e1
author Linus Torvalds <torvalds@linux-foundation.org> 1280442104 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1280442104 -0700

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: update MAINTAINERS entry