Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
commit8561b089afbaed2651591e5a4574fdca451d82f2
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 28 Jan 2008 22:00:01 +0000 (29 09:00 +1100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 28 Jan 2008 22:00:01 +0000 (29 09:00 +1100)
tree3c3bd24884eb65a89b0b896bcd7790e6144cebfc
parente189f3495c4e30fc84fc9241096edf3932e23439
parentb47a166ed0baaaa30112532bad41b21e7c5e4d31
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] constify function pointer tables
  [WATCHDOG] TXx9 watchdog driver
  [WATCHDOG] misc_register patch
  [WATCHDOG] wdt: fix locking