]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'watchdog/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 4 Nov 2011 03:35:56 +0000 (14:35 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 4 Nov 2011 03:35:56 +0000 (14:35 +1100)
1  2 
drivers/watchdog/Kconfig

Simple merge