]> git.karo-electronics.de Git - karo-tx-linux.git/commit - include/acpi/acpixf.h
Merge remote-tracking branch 'clk/clk-next'
authorThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 13:02:40 +0000 (15:02 +0200)
committerThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 13:02:40 +0000 (15:02 +0200)
commite1200d8a358cd07d1a39ce3275cf86241e14de02
tree40cea07888593d306b64fc300c2d641da99bac0b
parent25691330eb62649401cfb18ef518983511f6412f
parentf61027426a5bc7093aa8359a411b053a35bb4b68
Merge remote-tracking branch 'clk/clk-next'

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