]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Sun, 1 Nov 2015 23:47:34 +0000 (10:47 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Sun, 1 Nov 2015 23:47:34 +0000 (10:47 +1100)
1  2 
drivers/hwmon/Kconfig
drivers/hwmon/Makefile

Simple merge
Simple merge