diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-11 18:45:55 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-11 18:45:55 +0100 |
commit | 6102c315d896fb020550fb2481613485872978f6 (patch) | |
tree | d0afc2dca7492c65be45af869b5988053bd92f2d /include/drm/i830_drm.h | |
parent | core, x86: make LIST_POISON less deadly (diff) | |
parent | hwmon: Make PCI device ids constant (diff) | |
download | linux-6102c315d896fb020550fb2481613485872978f6.tar.xz linux-6102c315d896fb020550fb2481613485872978f6.zip |
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
hwmon: Make PCI device ids constant
hwmon: (coretemp) Fix TjMax for Atom N450/D410/D510 CPUs
hwmon: (k10temp) Blacklist more family 10h processors
hwmon: (asus_atk0110) Add debugfs interface
hwmon: (asus_atk0110) Refactor interface probe code
hwmon: (adt7462) Fix pin 28 monitoring
Diffstat (limited to 'include/drm/i830_drm.h')
0 files changed, 0 insertions, 0 deletions