projects / cascardo / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 17fa6e4 9d06d34)
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)
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>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.