tree b3d8154d69917bb35f53394c19e79aa6173d20c5
parent 03c669ab8c2c483c430a565c05cb3a25b1c55f5f
parent 6cfc00e0918a0551f790e768cea664d17c39e33f
author Linux Build Service Account <lnxbuild@localhost> 1327754948 -0800
committer QuIC Gerrit Code Review <code-review@localhost> 1327754948 -0800

Merge changes I92fff75b,I9d7e536f,I418df8c3,I684da4bd into msm-3.0

* changes:
  Input: atmel_mxt_ts: Add a debugfs attribute to show all objects
  board: 8960: Add config data for mXT1386E touch controller
  input: atmel_mxt_ts: Add support for object PROCI_SHIELDLESS_T56
  input: atmel_mxt_ts: Support runtime selection of config data