Merge branch 'ubuntu'
authorXavier Boudet <x-boudet@ti.com>
Fri, 1 Mar 2013 08:05:51 +0000 (09:05 +0100)
committerXavier Boudet <x-boudet@ti.com>
Fri, 1 Mar 2013 08:05:51 +0000 (09:05 +0100)
Conflicts:
debian/changelog
debian/patches/series

1  2 
debian/changelog
debian/patches/series

Simple merge
index 38341037ff52e6a3650f1d724566e297f4b596dc,8e758c8a16c6de8676a4879ccbb495d9c47d83c7..86887063ac09f35ca2fd48dc56c0a0f82000ef3d
@@@ -54,7 -54,3 +55,8 @@@
  #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
++