From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 7 Dec 2011 16:20:01 +0000 (-0800)
Subject: Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
X-Git-Tag: upstream/snapshot3+hdmi~8614
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=10ec5e6c0cfcc4289c0cb056cd330ad70ea39b7f;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  vmwgfx: Use kcalloc instead of kzalloc to allocate array
  drm/i915: fix infinite recursion on unbind due to ilk vt-d w/a
  drm/radeon/kms: fix return type for radeon_encoder_get_dp_bridge_encoder_id
---

10ec5e6c0cfcc4289c0cb056cd330ad70ea39b7f