]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'quilt/jdelvare-hwmon'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 20 Dec 2011 00:53:58 +0000 (11:53 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 20 Dec 2011 00:53:58 +0000 (11:53 +1100)

Trivial merge