Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 25 Aug 2009 16:30:58 +0000 (09:30 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 25 Aug 2009 16:30:58 +0000 (09:30 -0700)
commit7cafe60550469ad80e990d9223c4b5d501635015
treec432a5c1dd184d5c17cb57071100c240f374b0a6
parent5c58ceff103d8a654f24769bb1baaf84a841b0cc
parentc5e7f5a38a7ebf3697281bc7cb494e676f287ac0
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] ar7_wdt: fix path to ar7-specific headers