From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 7 Apr 2011 20:34:41 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
X-Git-Tag: v3.12-rc1~6402
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0c3efe54d0165cecf0698b468e253577b555dde6;p=kernel%2Fkernel-generic.git

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: mpc8xxx_wdt: fix build
---

0c3efe54d0165cecf0698b468e253577b555dde6