tree 38ef5448f51540c8675adc9624ad976e3f5062c1
parent 682a2512ea9db79abc570d9fd80928e7e6b18d1e
parent eec99016e38b740662509f097effb90abc7a1376
author Linus Torvalds <torvalds@linux-foundation.org> 1385615215 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1385615215 -0800

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