]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'quilt/jdelvare-hwmon'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 5 Oct 2011 02:40:15 +0000 (13:40 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 5 Oct 2011 02:40:15 +0000 (13:40 +1100)

Trivial merge