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: make sure the drawable code doesn't call malloc(0).
  drm/radeon: add more IGP chipset pci ids
  drm: Spinlock initializer cleanup

...

This commit is contained in:

Linus Torvalds 2007-05-31 09:08:49 -07:00

parent bc8844ed9b c4814f9001

commit ad360bbbbe

3 changed files with 34 additions and 16 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

41

drivers/char/drm/drm_drawable.c

View file

7

drivers/char/drm/drm_pciids.h

View file

2

drivers/char/drm/i915_irq.c

View file