]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'clk/clk-next'
authorThierry Reding <treding@nvidia.com>
Fri, 25 Oct 2013 09:50:12 +0000 (11:50 +0200)
committerThierry Reding <treding@nvidia.com>
Fri, 25 Oct 2013 09:50:12 +0000 (11:50 +0200)
commit27c2676200f9ccc9672f99067b12a281ae099453
tree8b7719f3827417e75bd4aeddd7e5021651a5510d
parent03f3336b9c3a0810821ee05320b3373cba7cb02e
parentf61027426a5bc7093aa8359a411b053a35bb4b68
Merge remote-tracking branch 'clk/clk-next'

Conflicts:
drivers/clk/Makefile
drivers/clk/Makefile