Merge branch 'for-3.17/xusb-padctl' into for-3.17/dt
authorThierry Reding <treding@nvidia.com>
Thu, 17 Jul 2014 13:01:57 +0000 (15:01 +0200)
committerThierry Reding <treding@nvidia.com>
Thu, 17 Jul 2014 13:01:57 +0000 (15:01 +0200)

Trivial merge