]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'watchdog/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 21 Aug 2012 02:31:33 +0000 (12:31 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 21 Aug 2012 02:31:33 +0000 (12:31 +1000)

Trivial merge