From: Dave Airlie <airlied@gmail.com>
Date: Thu, 10 Jan 2013 21:47:25 +0000 (+1000)
Subject: Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=82ba789f48de669fd0bbc84c326f07571d078572;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel

Daniel writes:
"Pretty much all just major fixes:
- 2 pieces of duct-tape for the ilk bug.
- Sprite regression fixes from Chris.
- OOPS fix for a div-by-zero from Chris, regression due to the modeset
  rework in 3.7, now brought to light by a benign change in 3.8.
- Fix interrupted bo pinning, used to work around CS coherency issues on
  i830/i845 (kernel also has a w/a newly in 3.8, but pinning is more efficient if
  possible)."
---

82ba789f48de669fd0bbc84c326f07571d078572