]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'watchdog/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 20 Dec 2011 03:28:32 +0000 (14:28 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 20 Dec 2011 03:28:32 +0000 (14:28 +1100)

Trivial merge