Merge branch 'ubuntu'
authorXavier Boudet <x-boudet@ti.com>
Fri, 4 Jan 2013 12:39:08 +0000 (13:39 +0100)
committerXavier Boudet <x-boudet@ti.com>
Fri, 4 Jan 2013 12:39:08 +0000 (13:39 +0100)
Conflicts:
debian/changelog
debian/patches/series

1  2 
debian/changelog
debian/patches/series

Simple merge
index 14910e7e1757a5885e5140c9455d3721a1a99e0e,099965c1d85c75ce673bf1c2b40cf718a00ac4a3..32636a0286c2c12daa06279cac497f8b6fa65cc1
@@@ -53,7 -54,4 +55,8 @@@
  #515-dix-disable-all-devices-before-shutdown.patch
  516-dix-dont-emulate-scroll-events-for-non-existing-axes.patch
  
+ 237-dix-set-the-device-transformation-matrix.patch
++
 +# Rotation patches
 +1001-xfree86-modes-Let-the-driver-handle-the-transform.patch
 +1002-xfree86-modes-Make-cursor-position-transform-a-helpe.patch