| commit | 3b775e2246ae861daec276d3229a7de2af69b7db | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Thu, 30 Jun 2011 17:43:57 +0000 (30 10:43 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Thu, 30 Jun 2011 17:43:57 +0000 (30 10:43 -0700) | ||
| tree | 6d2811f0742beea2358df19e93e9dff5f935d230 | treesnapshot (tar.gz zip) |
| parent | c8618d16f91f58c01be4bdbec4d724efe426a081 | commitdiff |
| parent | aeb0aea143e958d5218162d73b1ed4d6ff0ed7c4 | commitdiff |
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: update author email for at32ap700x_wdt
watchdog: gef_wdt: fix MODULE_ALIAS
watchdog: Intel SCU Watchdog: Fix build and remove duplicate code
watchdog: mtx1-wdt: fix section mismatch
watchdog: mtx1-wdt: fix GPIO toggling
watchdog: mtx1-wdt: request gpio before using it
watchdog: Handle multiple wm831x watchdogs being registered
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
watchdog: update author email for at32ap700x_wdt
watchdog: gef_wdt: fix MODULE_ALIAS
watchdog: Intel SCU Watchdog: Fix build and remove duplicate code
watchdog: mtx1-wdt: fix section mismatch
watchdog: mtx1-wdt: fix GPIO toggling
watchdog: mtx1-wdt: request gpio before using it
watchdog: Handle multiple wm831x watchdogs being registered