]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'watchdog/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 12 Sep 2013 01:47:33 +0000 (11:47 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 12 Sep 2013 01:47:33 +0000 (11:47 +1000)
1  2 
drivers/watchdog/Kconfig
drivers/watchdog/Makefile
drivers/watchdog/hpwdt.c

Simple merge
Simple merge
Simple merge