]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'watchdog/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 Sep 2011 03:08:15 +0000 (13:08 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 Sep 2011 03:08:15 +0000 (13:08 +1000)

Trivial merge