summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-11-27 21:06:55 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2013-11-27 21:06:55 -0800
commite7c0d3dac88bc38c4ccd64261d572f67eff056fd (patch)
tree38ef5448f51540c8675adc9624ad976e3f5062c1 /kernel
parent682a2512ea9db79abc570d9fd80928e7e6b18d1e (diff)
parenteec99016e38b740662509f097effb90abc7a1376 (diff)
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull drm fixes from Dave Airlie: "Just two minor fixes as people keep resending since they are so low hanging" * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: drm/nouveau/hwmon: fix compilation without CONFIG_HWMON drm/sysfs: fix OOM verification
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions