]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
Merge branch 'drm-patches' of ssh://master.kernel.org/pub/scm/linux/kernel/git/airlie...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 17 Jul 2007 15:44:27 +0000 (08:44 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 17 Jul 2007 15:44:27 +0000 (08:44 -0700)
commitae6f4a8b986c9d9eff00fcbd23d1c2585b97fe57
treef9a8b8a226cf1f30cb37966482ab64bd4e5161bd
parenta5fcaa210626a79465321e344c91a6a7dc3881fa
parent45ea5dcde62db8eccc8503defae3c3353256975d
Merge branch 'drm-patches' of ssh://master.kernel.org/pub/scm/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.