Merge branch 'ubuntu'
authorXavier Boudet <x-boudet@ti.com>
Thu, 30 Aug 2012 12:59:01 +0000 (14:59 +0200)
committerXavier Boudet <x-boudet@ti.com>
Thu, 30 Aug 2012 12:59:01 +0000 (14:59 +0200)
Conflicts:
debian/changelog
debian/patches/series

1  2 
debian/changelog
debian/patches/series

Simple merge
index 325ccbe1d665e929b45f115c079619932cd89885,0279297a352a21314c77e7b88dcc9a13b518a7ff..14910e7e1757a5885e5140c9455d3721a1a99e0e
  #515-dix-disable-all-devices-before-shutdown.patch
  516-dix-dont-emulate-scroll-events-for-non-existing-axes.patch
  
- # Upstream patches
- 516-randr-first-check-pScrPriv-before-using-the-pointer.patch
- 517-randr-Catch-two-more-potential-unset-rrScrPriv-uses.patch
 +# Rotation patches
 +1001-xfree86-modes-Let-the-driver-handle-the-transform.patch
 +1002-xfree86-modes-Make-cursor-position-transform-a-helpe.patch
 +