From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 12 Sep 2011 18:51:35 +0000 (-0700)
Subject: Merge branch 'fixes' of git://git.linaro.org/people/arnd/arm-soc
X-Git-Tag: firefly_0821_release~3680^2~4498
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4c7527821c125c76432c30c8781667f55bed600c;p=firefly-linux-kernel-4.4.55.git

Merge branch 'fixes' of git://git.linaro.org/people/arnd/arm-soc

* 'fixes' of git://git.linaro.org/people/arnd/arm-soc:
  ARM: CSR: add missing sentinels to of_device_id tables
  ARM: cns3xxx: Fix newly introduced warnings in the PCIe code
  ARM: cns3xxx: Fix compile error caused by hardware.h removed
  ARM: davinci: fix cache flush build error
  ARM: davinci: correct MDSTAT_STATE_MASK
  ARM: davinci: da850 EVM: read mac address from SPI flash
  OMAP: omap_device: fix !CONFIG_SUSPEND case in _noirq handlers
  OMAP2430: hwmod: musb: add missing terminator to omap2430_usbhsotg_addrs[]
  OMAP3: clock: indicate that gpt12_fck and wdt1_fck are in the WKUP clockdomain
  OMAP4: clock: fix compile warning
  OMAP4: clock: re-enable previous clockdomain enable/disable sequence
  OMAP: clockdomain: Wait for powerdomain to be ON when using clockdomain force wakeup
  OMAP: powerdomains: Make all powerdomain target states as ON at init
---

4c7527821c125c76432c30c8781667f55bed600c