| commit | e7c0d3dac88bc38c4ccd64261d572f67eff056fd | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Thu, 28 Nov 2013 05:06:55 +0000 (27 21:06 -0800) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Thu, 28 Nov 2013 05:06:55 +0000 (27 21:06 -0800) | ||
| tree | 38ef5448f51540c8675adc9624ad976e3f5062c1 | treesnapshot (tar.gz zip) |
| parent | 682a2512ea9db79abc570d9fd80928e7e6b18d1e | commitdiff |
| parent | eec99016e38b740662509f097effb90abc7a1376 | commitdiff |
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
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