summaryrefslogtreecommitdiffstats
path: root/firmware/yam
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-06-30 19:43:57 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-06-30 19:43:57 +0200
commit3b775e2246ae861daec276d3229a7de2af69b7db (patch)
tree6d2811f0742beea2358df19e93e9dff5f935d230 /firmware/yam
parentMerge branch 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kerne... (diff)
parentwatchdog: update author email for at32ap700x_wdt (diff)
downloadlinux-3b775e2246ae861daec276d3229a7de2af69b7db.tar.xz
linux-3b775e2246ae861daec276d3229a7de2af69b7db.zip
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: 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
Diffstat (limited to 'firmware/yam')
0 files changed, 0 insertions, 0 deletions