diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-19 02:49:42 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-19 02:49:42 +0100 |
| commit | 112ccff716ae74ffa5f30266b29c4d72aab4074b (patch) | |
| tree | f6d5cbe0835975d4920f77a8511e874290071a1b /net/nfc/llcp/llcp.c | |
| parent | sgy-cts1000: Remove __dev* attributes (diff) | |
| parent | hwmon: (lm75) Fix tcn75 prefix (diff) | |
| download | linux-112ccff716ae74ffa5f30266b29c4d72aab4074b.tar.xz linux-112ccff716ae74ffa5f30266b29c4d72aab4074b.zip | |
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/nfc/llcp/llcp.c')
0 files changed, 0 insertions, 0 deletions