]> git.ipfire.org Git - people/ms/linux.git/commit
projects / people / ms / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 682a251 eec9901)
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 28 Nov 2013 05:06:55 +0000 (21:06 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 28 Nov 2013 05:06:55 +0000 (21:06 -0800)
commite7c0d3dac88bc38c4ccd64261d572f67eff056fd
tree38ef5448f51540c8675adc9624ad976e3f5062c1tree | snapshot
parent682a2512ea9db79abc570d9fd80928e7e6b18d1ecommit | diff
parenteec99016e38b740662509f097effb90abc7a1376commit | 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
Michael's Linux tree.