From: Olof Johansson <olof@lixom.net>
Date: Wed, 24 Sep 2014 17:37:27 +0000 (-0700)
Subject: Merge tag 'mvebu-soc-3.18' of git://git.infradead.org/linux-mvebu into next/cleanup
X-Git-Tag: v3.18-rc1~121^2~4
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=c82eb464879dd0ecbe0c4cb1b80ac4e82b634872;p=linux.git

Merge tag 'mvebu-soc-3.18' of git://git.infradead.org/linux-mvebu into next/cleanup

Merge "ARM: mvebu: SoC changes for v3.18" from Jason Cooper:

mvebu SoC changes for v3.18

 - orion5x
    - remove pr_warning(), use pr_warn()

* tag 'mvebu-soc-3.18' of git://git.infradead.org/linux-mvebu:
  ARM: orion5x: Convert pr_warning to pr_warn

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

c82eb464879dd0ecbe0c4cb1b80ac4e82b634872