]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'sparc/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 10 Feb 2016 22:55:19 +0000 (09:55 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 10 Feb 2016 22:55:19 +0000 (09:55 +1100)
1  2 
drivers/watchdog/Kconfig

Simple merge