Merge tag 'mvebu-soc-3.18' of git://git.infradead.org/linux-mvebu into next/cleanup
authorOlof Johansson <olof@lixom.net>
Wed, 24 Sep 2014 17:37:27 +0000 (10:37 -0700)
committerOlof Johansson <olof@lixom.net>
Wed, 24 Sep 2014 17:37:53 +0000 (10:37 -0700)
commitc82eb464879dd0ecbe0c4cb1b80ac4e82b634872
tree53bc8043bd897081a2d6f499cdfe915b9be9684a
parent17fa6e4ecf1ccab5e90db7025cfc9d459774cd3f
parent9d06d34bcc62f4cc3679704ac42cff5b44a97c6e
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>