| commit | 732b2a1a4bb58677ba9c7be3fac0960ceccc9b8f | [log] [tgz] |
|---|---|---|
| author | Adam Jackson <ajax@redhat.com> | Wed Feb 20 11:54:17 2013 -0500 |
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Wed Feb 27 09:21:19 2013 -0800 |
| tree | a25c159a031a51e41f43c498dd1e8a07b239c9dd | |
| parent | 53aa75aa360992e07141bbfa2c6062110e678605 [diff] |
drm/i915: Fix up mismerge of 3490ea5d in 3.7.y The 3.7.y version of this seems to have missed a hunk in i9xx_update_wm. Tested-by: Glen Gray <slaine@slaine.org> Signed-off-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>