]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
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)

Trivial merge