diff options
| author | Olof Johansson <olof@lixom.net> | 2014-09-24 19:37:27 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-09-24 19:37:53 +0200 |
| commit | c82eb464879dd0ecbe0c4cb1b80ac4e82b634872 (patch) | |
| tree | 53bc8043bd897081a2d6f499cdfe915b9be9684a /arch/alpha | |
| parent | ARM: sunxi: Remove sun4i reboot code from mach directory (diff) | |
| parent | ARM: orion5x: Convert pr_warning to pr_warn (diff) | |
| download | linux-c82eb464879dd0ecbe0c4cb1b80ac4e82b634872.tar.xz linux-c82eb464879dd0ecbe0c4cb1b80ac4e82b634872.zip | |
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>
Diffstat (limited to 'arch/alpha')
0 files changed, 0 insertions, 0 deletions