projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
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


Trivial merge
John Crispins staging tree