diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-01-24 14:37:31 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-01-24 14:37:31 -0800 |
| commit | 0012125adee58a3865da7701583b7b1aee3b4ba8 (patch) | |
| tree | 8f168e15f52d2080365c8c7b1a68dbb62cd52868 /drivers/watchdog/cadence_wdt.c | |
| parent | af469b374831f48744c14b60d3e6c928c5ce2ef0 (diff) | |
| parent | 86c725e3c5a6baa5316787e0b017d8ac8b0facd8 (diff) | |
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
Pull hwmon update from Jean Delvare:
"This contains a single thing: a new driver for the temperature sensor
embedded in the Intel 5500/5520/X58 chipsets.
Sorry for the late request, it's been so long since I last sent a pull
request and I've been so busy with other tasks meanwhile that I simply
forgot about these patches. But given that this is a new driver, it
can't introduce any regression so I thought it could still be OK.
This has been in linux-next for months now"
* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
hwmon: (i5500_temp) Convert to use ATTRIBUTE_GROUPS macro
hwmon: (i5500_temp) Convert to module_pci_driver
hwmon: (i5500_temp) Don't bind to disabled sensors
hwmon: (i5500_temp) Convert to devm_hwmon_device_register_with_groups
hwmon: (i5500_temp) New driver for the Intel 5500/5520/X58 chipsets
Diffstat (limited to 'drivers/watchdog/cadence_wdt.c')
0 files changed, 0 insertions, 0 deletions