From: Olof Johansson <olof@lixom.net>
Date: Thu, 7 Aug 2014 22:03:02 +0000 (-0700)
Subject: Merge branch 'next/fixes-non-critical' into next/cleanup
X-Git-Tag: v3.17-rc1~80^2
X-Git-Url: http://git.cascardo.info/?a=commitdiff_plain;h=c4846a7823bfd34ecb2dc56b025e19285432d08d;p=cascardo%2Flinux.git

Merge branch 'next/fixes-non-critical' into next/cleanup

Merging in the few fixes we had also received, no need to keep those in
a separate branch.

* next/fixes-non-critical:
  drivers: CCI: Correct use of ! and &
  MAINTAINERS: Add sdhci-st file to ARCH/STI architecture
  ARM: EXYNOS: Fix build breakge with PM_SLEEP=n
  ARM: omap2+: gpmc-nand: Use dynamic platform_device_alloc()
  omap16xx: Removes fixme no longer needed in ocpi_enable()
  ARM: dts: OMAP5: Add device nodes for ABB
  ARM: omap2+: usb-tusb6010.c: Cleaning up variable is set more than once

Signed-off-by: Olof Johansson <olof@lixom.net>
---

c4846a7823bfd34ecb2dc56b025e19285432d08d