From: Bjorn Helgaas Date: Wed, 6 Jun 2018 21:10:24 +0000 (-0500) Subject: Merge branch 'lorenzo/pci/armada8k' X-Git-Tag: for-linus-20180616~48^2~13 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=bdc4bb13773955d33f8fd23d79afbc95fda8dca4;p=linux-block.git Merge branch 'lorenzo/pci/armada8k' - enable register clock for Armada 7K/8K (Gregory CLEMENT) * lorenzo/pci/armada8k: PCI: armada8k: Fix clock resource by adding a register clock PCI: armada8k: Remove useless test before clk_disable_unprepare() --- bdc4bb13773955d33f8fd23d79afbc95fda8dca4