]> 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>
Wed, 21 Dec 2011 00:50:03 +0000 (11:50 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 Dec 2011 00:50:03 +0000 (11:50 +1100)
1  2 
drivers/hwmon/Kconfig

Simple merge