diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-23 13:56:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-23 13:56:24 -0700 |
| commit | 5de551e0eeddf470928e9fee59825a3645641bc7 (patch) | |
| tree | d795f5003741709f0c218a5cce58ed96853de6f3 /arch/ia64/kernel | |
| parent | eb0c5ff6f3f12e717ecb0392b137884e40bb32bd (diff) | |
| parent | 3d5960472de0a245c56ba55e9a59b8d0f4c69cb4 (diff) | |
Merge tag 'hwmon-for-linus-v3.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull a hwmon fix from Guenter Roeck:
"Fix potential compile problem for menf21bmc hwmon driver"
* tag 'hwmon-for-linus-v3.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
hwmon: (menf21bmc) Include linux/err.h
Diffstat (limited to 'arch/ia64/kernel')
0 files changed, 0 insertions, 0 deletions