]> 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, 14 Dec 2011 01:06:38 +0000 (12:06 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Dec 2011 01:06:38 +0000 (12:06 +1100)
1  2 
drivers/hwmon/Kconfig

Simple merge