diff options
| author | Adam Jackson <ajax@redhat.com> | 2013-02-20 11:54:17 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-02-27 09:21:19 -0800 |
| commit | 732b2a1a4bb58677ba9c7be3fac0960ceccc9b8f (patch) | |
| tree | a25c159a031a51e41f43c498dd1e8a07b239c9dd /kernel/gcov/gcov.h | |
| 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>
Diffstat (limited to 'kernel/gcov/gcov.h')
0 files changed, 0 insertions, 0 deletions