]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Dec 2011 00:38:32 +0000 (11:38 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Dec 2011 00:38:32 +0000 (11:38 +1100)

Trivial merge