]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch for-3.17/dt-cros-ec-kbd into for-next
authorStephen Warren <swarren@nvidia.com>
Wed, 25 Jun 2014 20:33:03 +0000 (14:33 -0600)
committerStephen Warren <swarren@nvidia.com>
Wed, 25 Jun 2014 20:33:03 +0000 (14:33 -0600)

Trivial merge