]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge commit 'refs/next/20111025/watchdog'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 2 Nov 2011 03:00:42 +0000 (14:00 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 2 Nov 2011 03:00:42 +0000 (14:00 +1100)

Trivial merge