aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-09-28 12:13:13 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-09-28 12:13:13 -0700
commitb4d32648c190711177a664af7d51149a8950555e (patch)
tree122bebbb0a1a150eee3e13a0f1689f1e8155f933 /drivers/gpu/drm
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 (diff)
parenthwmon (coretemp): Fix build breakage if SMP is undefined (diff)
downloadlinux-dev-b4d32648c190711177a664af7d51149a8950555e.tar.xz
linux-dev-b4d32648c190711177a664af7d51149a8950555e.zip
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging
* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging: hwmon (coretemp): Fix build breakage if SMP is undefined
Diffstat (limited to 'drivers/gpu/drm')
0 files changed, 0 insertions, 0 deletions