diff options
| author | Jesse Barnes <jesse.barnes@intel.com> | 2007-11-01 15:27:55 -0700 |
|---|---|---|
| committer | Jesse Barnes <jesse.barnes@intel.com> | 2007-11-01 15:27:55 -0700 |
| commit | 629c8b0dbf975632473d848f60606baf309f2f3b (patch) | |
| tree | 9b85064c2673527cb7515af7e356bb47aaa4639f /linux-core/mga_irq.c | |
| parent | 90d8f792794d46d1a8e998856bc7bbe54596114b (diff) | |
| parent | 5766d81074d6faa7f14b45635765cdb7209597fc (diff) | |
Merge branch 'master' into modesetting-101
Conflicts:
linux-core/Makefile.kernel
linux-core/drm_stub.c
linux-core/i915_drv.c
shared-core/i915_dma.c
shared-core/i915_drv.h
Fixup suspend/resume conflicts (basically use what's in DRM master for now).
Also fix up a few other conflicts that snuck in (i915_dma changes etc.).
Diffstat (limited to 'linux-core/mga_irq.c')
0 files changed, 0 insertions, 0 deletions