diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-16 08:39:52 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-16 08:39:52 -0800 |
| commit | 4c44323db15f26f4c744f06179daa43711cdb708 (patch) | |
| tree | e9e7a1fc18127ac1f6016a9f292dde72ce3d2487 /drivers/macintosh/mac_hid.c | |
| parent | 50246dd41ccbcb47beb06d6c1d9355f6b7137a11 (diff) | |
| parent | 34b8686e12eaf9878aaab89e92222060c3e7cc48 (diff) | |
Merge branch 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm/i915: lock correct mutex around object unreference.
drm/i915: add support for physical memory objects
drm/i915: make LVDS fixed mode a preferred mode
drm: handle depth & bpp changes correctly
drm: initial KMS config fixes
drm/i915: setup sarea properly in master_priv
drm/i915: set vblank enabled flag correctly across IRQ install/uninstall
drm/i915: don't enable vblanks on disabled pipes
Diffstat (limited to 'drivers/macintosh/mac_hid.c')
0 files changed, 0 insertions, 0 deletions