]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 26 Oct 2012 00:47:32 +0000 (11:47 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 26 Oct 2012 00:47:32 +0000 (11:47 +1100)

Trivial merge