summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nv10_fb.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-01-11 09:45:55 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-01-11 09:45:55 -0800
commit6102c315d896fb020550fb2481613485872978f6 (patch)
treed0afc2dca7492c65be45af869b5988053bd92f2d /drivers/gpu/drm/nouveau/nv10_fb.c
parenta29815a333c6c6e677294bbe5958e771d0aad3fd (diff)
parent3dd3a156355e7e6bec0dc9a0bbb6eeecbd965d50 (diff)
downloadlinux-6102c315d896fb020550fb2481613485872978f6.tar.bz2
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 'drivers/gpu/drm/nouveau/nv10_fb.c')
0 files changed, 0 insertions, 0 deletions