Merge branch 'ubuntu'
authorXavier Boudet <x-boudet@ti.com>
Wed, 9 May 2012 07:22:04 +0000 (09:22 +0200)
committerXavier Boudet <x-boudet@ti.com>
Wed, 9 May 2012 07:22:04 +0000 (09:22 +0200)
Conflicts:
debian/changelog
debian/patches/series

1  2 
debian/changelog
debian/patches/series

Simple merge
index 6af5ed7d21c558bea2741cb4ae846bcda5515eb5,1b863e7ccfa108fc4f45b4760946cebb26a3829d..0e0102575eb1814b4164dc325a7efa50410df49b
@@@ -37,7 -36,4 +37,8 @@@
  505_query_pointer_touchscreen.patch
  506_touchscreen_pointer_emulation_checks.patch
  507_touchscreen_fixes.patch
+ 508_device_off_release_buttons.patch
 +
 +#Rotation patches
 +1001-xfree86-modes-Let-the-driver-handle-the-transform.patch
 +1002-xfree86-modes-Make-cursor-position-transform-a-helpe.patch