]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'quilt/jdelvare-hwmon'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 4 Oct 2011 01:28:46 +0000 (12:28 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 4 Oct 2011 01:28:46 +0000 (12:28 +1100)

Trivial merge