diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-14 14:43:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-14 14:43:23 -0700 |
| commit | 503698e12d68f6144b408b11156ad315943ffb53 (patch) | |
| tree | 378979f76b321a114e910da59e06f1d6c2ff625e /drivers/ide/sgiioc4.c | |
| parent | 6391f34e844c71ebf645058b2b643f70fed5b990 (diff) | |
| parent | 78cebd0889c7b8b92f43e7667efc16636b858c34 (diff) | |
Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon updates from Guenter Roeck:
- new driver for Sensirion SHTC1 humidity / temperature sensor
- convert ltc4151 and vexpress drivers to use devm functions
- drop generic chip detection from lm85 driver
- avoid forward declarations in atxp1 driver
- fix sign extensions in ina2xx driver
* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
hwmon: vexpress: Use devm helper for hwmon device registration
hwmon: (atxp1) Avoid forward declaration
hwmon: add support for Sensirion SHTC1 sensor
hwmon: (ltc4151) Convert to devm_hwmon_device_register_with_groups
hwmon: (lm85) Drop generic detection
hwmon: (ina2xx) Cast to s16 on shunt and current regs
Diffstat (limited to 'drivers/ide/sgiioc4.c')
0 files changed, 0 insertions, 0 deletions