[git pull] drm minor fixes

[Dave Airlie]

Hi Linus,

just two minor fixes as people keep resending since they are so low 
hanging.

Dave.

The following changes since commit 8ae516aa8b8161254d3e402b3348b2a9b8d1efd0:

  Merge tag 'trace-fixes-v3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace (2013-11-26 18:04:21 -0800)

are available in the git repository at:


  git://people.freedesktop.org/~airlied/linux drm-fixes

for you to fetch changes up to eec99016e38b740662509f097effb90abc7a1376:

  drm/nouveau/hwmon: fix compilation without CONFIG_HWMON (2013-11-28 14:38:09 +1000)

----------------------------------------------------------------
David Herrmann (1):
      drm/sysfs: fix OOM verification

Ilia Mirkin (1):
      drm/nouveau/hwmon: fix compilation without CONFIG_HWMON

 drivers/gpu/drm/drm_sysfs.c             | 2 +-
 drivers/gpu/drm/nouveau/nouveau_hwmon.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)