Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-mips main mailing list]

Author: Ralf Baechle <ralf@...> Thu Nov 5 07:43:03 2009 +0100
Commit: 47b4961efa02899ccfb0aba91bff1f7a0629fa94
Gitweb: http://www.linux-mips.org/g/linux/47b4961e
Branch: master

---

 drivers/gpu/drm/i915/i915_dma.c      |    3
 drivers/gpu/drm/i915/i915_drv.h      |   39 ++++
 drivers/gpu/drm/i915/i915_reg.h      |   30 +++
 drivers/gpu/drm/i915/i915_suspend.c  |  305 +++++++++++++++++++++++++++-------
 drivers/gpu/drm/i915/intel_bios.c    |   14 +-
 drivers/gpu/drm/i915/intel_display.c |  178 ++++++++++++++++++--
 drivers/gpu/drm/i915/intel_dp.c      |    2
 drivers/gpu/drm/i915/intel_lvds.c    |   10 +
 8 files changed, 486 insertions(+), 95 deletions(-)