]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'watchdog/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Apr 2015 04:36:10 +0000 (14:36 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Apr 2015 04:36:10 +0000 (14:36 +1000)
1  2 
arch/arm/boot/dts/qcom-ipq8064.dtsi
drivers/watchdog/Kconfig

Simple merge
Simple merge