tree a2e418e9a5225d3f0b291d6520ad097f94378576
parent 217336cad0c0d98bb32cb781bb13c1a07f5a203c
parent 7674c5911ba54c35954532eba1267968cc438a86
author Linux Build Service Account <lnxbuild@localhost> 1396019915 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> 1396019915 -0700

Merge "input: touchscreen: change the focaltech firmware upgrade method"