diff options
| author | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2012-02-22 17:09:53 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2012-02-22 17:09:53 -0300 |
| commit | 6cb3779930bb81b2e87eb0440b6a730ca99e9d56 (patch) | |
| tree | 0af039b9463ff5c40b657de200b9dd06675328dc /kernels/linux-libre-xen/i915-fix-ghost-tv-output.patch | |
| parent | f4e8283bcde80efd3e057defa14476a708c3d34d (diff) | |
| parent | 08ffdb45067133abf9caba2636fa2e1d98d33b58 (diff) | |
| download | abslibre-6cb3779930bb81b2e87eb0440b6a730ca99e9d56.tar.gz abslibre-6cb3779930bb81b2e87eb0440b6a730ca99e9d56.tar.bz2 abslibre-6cb3779930bb81b2e87eb0440b6a730ca99e9d56.zip | |
Merge branch 'master' of ssh://gparabola/abslibre
Conflicts:
kernels/linux-libre-xen/i915-fix-ghost-tv-output.patch
Diffstat (limited to 'kernels/linux-libre-xen/i915-fix-ghost-tv-output.patch')
| -rw-r--r-- | kernels/linux-libre-xen/i915-fix-ghost-tv-output.patch | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/kernels/linux-libre-xen/i915-fix-ghost-tv-output.patch b/kernels/linux-libre-xen/i915-fix-ghost-tv-output.patch index 96654047b..3b631361a 100644 --- a/kernels/linux-libre-xen/i915-fix-ghost-tv-output.patch +++ b/kernels/linux-libre-xen/i915-fix-ghost-tv-output.patch @@ -24,4 +24,3 @@ index dc83b7a..c8f67bf 100644 I915_WRITE(TV_CTL, tv_ctl); I915_WRITE(TV_DAC, tv_dac); POSTING_READ(TV_DAC); - |