From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 17 Jul 2007 15:44:27 +0000 (-0700)
Subject: Merge branch 'drm-patches' of ssh://master.kernel.org/pub/scm/linux/kernel/git/airlie... 
X-Git-Tag: v3.12-rc1~28359
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ae6f4a8b986c9d9eff00fcbd23d1c2585b97fe57;p=kernel%2Fkernel-generic.git

Merge branch 'drm-patches' of ssh:///linux/kernel/git/airlied/drm-2.6

* 'drm-patches' of ssh://master.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm: add idr_init to drm_stub.c
  drm: fix problem with SiS typedef with sisfb enabled.
---

ae6f4a8b986c9d9eff00fcbd23d1c2585b97fe57