Merge branch 'for-3.17/dt-cros-ec-kbd' into for-3.17/dt
authorThierry Reding <treding@nvidia.com>
Thu, 17 Jul 2014 13:01:44 +0000 (15:01 +0200)
committerThierry Reding <treding@nvidia.com>
Thu, 17 Jul 2014 13:01:44 +0000 (15:01 +0200)
commit6efcbfe67f89f4086a947f0ecf9cac0ae08a0434
tree79fe4307e1c06a006fb1c9cac77c67255bfc9f4f
parentb0b64f7b2d35eb8df056e1252ce971ebc624372c
parent1a395e3b4f2e9038964c9eec392ed5300a4b5b83
Merge branch 'for-3.17/dt-cros-ec-kbd' into for-3.17/dt