diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-23 21:15:09 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-23 21:15:09 (GMT) |
| commit | 1259f6ee15c1603dcae41eb6af5a5f9cf932d4d6 (patch) | |
| tree | bf85658f7c5a2c86da3bc613d7fea13bbffe4e72 /crypto/algif_hash.c | |
| parent | 468f4d1a855f8039dabf441b8bf68cae264033ff (diff) | |
| parent | 4573acbc461b8089198500cee06ef0cdc5b70e82 (diff) | |
| download | linux-fsl-qoriq-1259f6ee15c1603dcae41eb6af5a5f9cf932d4d6.tar.xz | |
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 INA219 and INA226, added support for IT8782F and
IT8783E/F to it87 driver, plus cleanups in a couple of drivers."
* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
hwmon: (it87) Make temp3 attribute conditional for IT8782F
hwmon: (it87) Convert to use devm_kzalloc and devm_request_region
hwmon: INA219 and INA226 support
hwmon: (it87) Create voltage attributes only if voltage is enabled
hwmon: (ntc_thermistor) Fix checkpatch warning
hwmon: (ntc_thermistor) Optimize and fix build warning
hwmon: (ntc_thermistor) Return error code from hwmon_device_register
hwmon: (ntc_thermistor) Convert to devm_kzalloc
hwmon: (ad7314) Remove unused defines, and rename OFFSET to SHIFT
acpi_power_meter: clean up code around setup_attrs
acpi_power_meter: drop meter_rw_attrs, use common meter_attrs
acpi_power_meter: remove duplicate code between register_{ro,rw}_attrs
acpi_power_meter: use a {RW,RO}_SENSOR_TEMPLATE macro to clean things up
acpi_power_meter: use the same struct {rw,ro}_sensor_template for both
hwmon: use module_pci_driver
hwmon: (it87) Add support for IT8782F and IT8783E/F
Diffstat (limited to 'crypto/algif_hash.c')
0 files changed, 0 insertions, 0 deletions