From: Linus Torvalds Date: Sat, 8 Aug 2015 01:30:37 +0000 (+0300) Subject: Merge tag 'hwmon-for-linus-v4.2-rc6' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Tag: omap-for-v4.3/fixes-merge-window~127 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea8dc1abeb09b401bdaea39cfb9850c80f8ef3ef;p=pandora-kernel.git Merge tag 'hwmon-for-linus-v4.2-rc6' of git://git./linux/kernel/git/groeck/linux-staging Pull hwmon fixes from Guenter Roeck: - Export module alias information in g762 and nct7904 to support auto-loading. - Blacklist Dell Studio XPS 8100 in dell-smm to fix fan control problems. * tag 'hwmon-for-linus-v4.2-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: hwmon: (g762) Export OF module alias information hwmon: (nct7904) Export I2C module alias information hwmon: (dell-smm) Blacklist Dell Studio XPS 8100 --- ea8dc1abeb09b401bdaea39cfb9850c80f8ef3ef Reading git-diff-tree failed