From: Xavier Boudet <x-boudet@ti.com>
Date: Tue, 10 Jul 2012 11:30:17 +0000 (+0200)
Subject: Merge branch 'ubuntu'
X-Git-Url: https://git.ti.com/gitweb?p=glsdk%2Fxserver.git;a=commitdiff_plain;h=27d619bdbad2f8d27ab4edc6fc4964b4a5682498

Merge branch 'ubuntu'

Conflicts:
	debian/changelog
	debian/patches/series
---

27d619bdbad2f8d27ab4edc6fc4964b4a5682498
diff --cc debian/patches/series
index 9c2df79,c6e059f..6d6a64c
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -46,7 -45,4 +46,8 @@@
  513-dix-disable-non-sprite-owners-first-when-disabling-p.patch
  514-Xi-drop-forced-unpairing-when-changing-the-hierarchy.patch
  515-dix-disable-all-devices-before-shutdown.patch
+ 516-dix-dont-emulate-scroll-events-for-non-existing-axes.patch
 +
 +#Rotation patches
 +1001-xfree86-modes-Let-the-driver-handle-the-transform.patch
 +1002-xfree86-modes-Make-cursor-position-transform-a-helpe.patch