projects / platform / upstream / kernel-adaptation-pc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3172f8f 24bb5a0)
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 7 Dec 2011 16:20:01 +0000 (08:20 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 7 Dec 2011 16:20:01 +0000 (08:20 -0800)
* '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


Trivial merge
Domain: System / Uncategorized;