From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 25 Aug 2009 16:30:58 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
X-Git-Tag: v2.6.31-rc8~36
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7cafe60550469ad80e990d9223c4b5d501635015;p=people%2Fms%2Flinux.git

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] ar7_wdt: fix path to ar7-specific headers
---

7cafe60550469ad80e990d9223c4b5d501635015