From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 5 Jul 2016 13:56:33 +0000 (+0200)
Subject: Merge tag 'mvebu-fixes-4.7-2' of git://git.infradead.org/linux-mvebu into fixes
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=86545b94376f445a3646227f0d433bec5e00499b;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge tag 'mvebu-fixes-4.7-2' of git://git.infradead.org/linux-mvebu into fixes

Pull "mvebu fixes for 4.7 (part 2)" from Gregory CLEMENT:

Fix a regression introduced by a cleanup on kirkwood_pm_init

* tag 'mvebu-fixes-4.7-2' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: compile pm code conditionally
---

86545b94376f445a3646227f0d433bec5e00499b