Merge branch 'drm-patches' of ssh://master.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6

Browse source

* '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.

...

This commit is contained in:

Linus Torvalds 2007-07-17 08:44:27 -07:00

parent a5fcaa2106 45ea5dcde6

commit ae6f4a8b98

2 changed files with 3 additions and 1 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

drivers/char/drm/drm_stub.c

View file

2

drivers/char/drm/sis_mm.c

View file