diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-19 01:49:42 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-19 01:49:42 (GMT) |
| commit | 112ccff716ae74ffa5f30266b29c4d72aab4074b (patch) | |
| tree | f6d5cbe0835975d4920f77a8511e874290071a1b /net/sched/act_ipt.c | |
| parent | 9997d08806062cb7ba471ab12fa2742cfec2f413 (diff) | |
| parent | 25eba81b7fbbb14dde63fc85231c699fe77afc58 (diff) | |
| download | linux-fsl-qoriq-112ccff716ae74ffa5f30266b29c4d72aab4074b.tar.xz | |
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
Diffstat (limited to 'net/sched/act_ipt.c')
0 files changed, 0 insertions, 0 deletions