commit | ae6f4a8b986c9d9eff00fcbd23d1c2585b97fe57 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Tue Jul 17 08:44:27 2007 -0700 |
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Tue Jul 17 08:44:27 2007 -0700 |
tree | f9a8b8a226cf1f30cb37966482ab64bd4e5161bd | |
parent | a5fcaa210626a79465321e344c91a6a7dc3881fa [diff] | |
parent | 45ea5dcde62db8eccc8503defae3c3353256975d [diff] |
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.