]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'watchdog/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 21 Mar 2013 03:01:02 +0000 (14:01 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 21 Mar 2013 03:01:02 +0000 (14:01 +1100)

Trivial merge