Merge git://www.linux-watchdog.org/linux-watchdog
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 14 Apr 2013 17:53:54 +0000 (10:53 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 14 Apr 2013 17:53:54 +0000 (10:53 -0700)
commit4f9a197c223cc019801be948e444d05904391109
tree53212e57ecf357dd006ec7d4626024cec307aa47
parent3792a64fdeeb9cab56c22695aaeb0624f1b295b4
parent09549cd01726a7ff8b102a93e46b059531583ab6
Merge git://www.linux-watchdog.org/linux-watchdog

Pull watchdog fix from Wim Van Sebroeck:
 "It will fix compile errors for the at91rm9200_wdt driver"

* git://www.linux-watchdog.org/linux-watchdog:
  watchdog: Revert the AT91RM9200_WATCHDOG dependency