Merge branch 'ubuntu'
authorXavier Boudet <x-boudet@ti.com>
Tue, 7 Aug 2012 09:06:01 +0000 (11:06 +0200)
committerXavier Boudet <x-boudet@ti.com>
Tue, 7 Aug 2012 09:06:01 +0000 (11:06 +0200)
Conflicts:
debian/changelog
debian/patches/series

1  2 
debian/changelog
debian/patches/series

Simple merge
index ae4891d4b1e1281b5ab7c1c3f95e68a4bd452a25,0ce1ed64837213ecf01d34ef2277392ef5fbcc5c..c548ae17ba7f36c62a6653faa1f812d532789033
@@@ -50,8 -49,4 +50,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
+ 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