From: Linus Torvalds Date: Thu, 28 Nov 2013 05:06:55 +0000 (-0800) Subject: Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux X-Git-Tag: v3.13-rc2~14 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=e7c0d3dac88bc38c4ccd64261d572f67eff056fd;p=~emulex%2Finfiniband.git 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 --- e7c0d3dac88bc38c4ccd64261d572f67eff056fd