Merge branch 'ubuntu'
authorXavier Boudet <x-boudet@ti.com>
Tue, 3 Jul 2012 17:00:44 +0000 (19:00 +0200)
committerXavier Boudet <x-boudet@ti.com>
Tue, 3 Jul 2012 17:00:44 +0000 (19:00 +0200)
Conflicts:
debian/changelog
debian/patches/series

1  2 
debian/changelog
debian/patches/series

Simple merge
index 0e0102575eb1814b4164dc325a7efa50410df49b,775d106ab7d1f7d8e32b593948b78cc0bede07f7..9c2df79a882f57fef2f00e30c84275aa50e2ce6f
  507_touchscreen_fixes.patch
  508_device_off_release_buttons.patch
  
+ # Upstream patches
+ 510-dix-return-early-from-DisableDevice-if-the-device-is.patch
+ 511-dix-move-freeing-the-sprite-into-a-function.patch
+ 512-dix-free-the-sprite-when-disabling-the-device.patch
+ 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
++
 +#Rotation patches
 +1001-xfree86-modes-Let-the-driver-handle-the-transform.patch
 +1002-xfree86-modes-Make-cursor-position-transform-a-helpe.patch