tree e004169ae37bc1b9fdc636146bd6967061f6f78a
parent 132452ee2368cf775ccbef9746b51e3d2ba58b85
parent d856b418464024dba4c7e901bab74dfb9a030d2e
author Linus Torvalds <torvalds@linux-foundation.org> 1302208481 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1302208481 -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: mpc8xxx_wdt: fix build