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

Simple merge