]> git.ipfire.org Git - people/ms/linux.git/commit
projects / people / ms / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit10ec5e6c0cfcc4289c0cb056cd330ad70ea39b7f
tree6967bfd9e2f3f26d150909c5cd1e6e9f31c7f335tree | snapshot
parent3172f8fe1ca1d432b196efad453c0ceb89302075commit | diff
parent24bb5a0ce39c51a2e2602c947f218a19e4b26d7dcommit | diff
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
Michael's Linux tree.