Merge branch 'ubuntu'
authorXavier Boudet <x-boudet@ti.com>
Mon, 21 Jan 2013 13:26:47 +0000 (14:26 +0100)
committerXavier Boudet <x-boudet@ti.com>
Mon, 21 Jan 2013 13:26:47 +0000 (14:26 +0100)
Conflicts:
debian/changelog
debian/patches/series

1  2 
debian/changelog
debian/patches/series

Simple merge
index 32636a0286c2c12daa06279cac497f8b6fa65cc1,568115491cfad4e6d3eca93239bbaa7cac5e8fb8..38341037ff52e6a3650f1d724566e297f4b596dc
@@@ -55,8 -54,3 +55,6 @@@
  #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