]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'quilt/jdelvare-hwmon'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 30 Nov 2011 01:37:40 +0000 (12:37 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 30 Nov 2011 01:37:40 +0000 (12:37 +1100)
1  2 
drivers/hwmon/Kconfig

Simple merge