commit | 112ccff716ae74ffa5f30266b29c4d72aab4074b | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Mar 18 18:49:42 2013 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Mar 18 18:49:42 2013 -0700 |
tree | f6d5cbe0835975d4920f77a8511e874290071a1b | |
parent | 9997d08806062cb7ba471ab12fa2742cfec2f413 [diff] | |
parent | 25eba81b7fbbb14dde63fc85231c699fe77afc58 [diff] |
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging Pull hwmon fixes from Jean Delvare. * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging: hwmon: (lm75) Fix tcn75 prefix hwmon: (lm75.h) Update header inclusion MAINTAINERS: Remove Mark M. Hoffman