Merge in ft5x06 driver
Merge branch 'pepper-android-3.2-dev' of https://github.com/gumdroid/android-kernel into pepper-android-3.2-dev

Conflicts:
	arch/arm/mach-omap2/board-am335xevm.c