summaryrefslogtreecommitdiff
path: root/Documentation/hwmon
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-04-29 00:14:02 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-04-29 00:14:02 +0400
commitfafc9929c668f8bae6dd1f109f33a86d2cb3c460 (patch)
treeea9739877f8d4107c8a36683e248595cedb1e738 /Documentation/hwmon
parent0dee0e7fbf446b02125a67f7dfe9415880d6564e (diff)
parente8e7a2b8ccfdae0d4cb6bd25824bbedcd42da316 (diff)
downloadlinux-fafc9929c668f8bae6dd1f109f33a86d2cb3c460.tar.xz
Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm/i915: restore only the mode of this driver on lastclose (v2) drm/radeon/kms: add info query for tile pipes drm/radeon/kms: add missing safe regs for 6xx/7xx drm: select FRAMEBUFFER_CONSOLE_PRIMARY if we have FRAMEBUFFER_CONSOLE
Diffstat (limited to 'Documentation/hwmon')
0 files changed, 0 insertions, 0 deletions