Merge branch 'ubuntu'
authorXavier Boudet <x-boudet@ti.com>
Tue, 10 Jul 2012 11:30:17 +0000 (13:30 +0200)
committerXavier Boudet <x-boudet@ti.com>
Tue, 10 Jul 2012 11:30:17 +0000 (13:30 +0200)
Conflicts:
debian/changelog
debian/patches/series

1  2 
debian/changelog
debian/patches/series

Simple merge
index 9c2df79a882f57fef2f00e30c84275aa50e2ce6f,c6e059f6ede72663269c54a0a2f8c5c2174cf85a..6d6a64cad121b1f19894756006e6de2292794051
@@@ -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