From: Olof Johansson Date: Thu, 15 Jan 2015 00:42:15 +0000 (-0800) Subject: Merge tag 'mvebu-soc-3.20' of git://git.infradead.org/linux-mvebu into next/soc X-Git-Tag: firefly_0821_release~176^2~2308^2~26 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=73298072885318557841a29dc0b99b5f0b4e2316;p=firefly-linux-kernel-4.4.55.git Merge tag 'mvebu-soc-3.20' of git://git.infradead.org/linux-mvebu into next/soc Merge "mvebu: SoC for 3.20" from Andrew Lunn: mvebu SoC changes for v3.20 (part #1) - Update the SoC ID and revision definitions - Add UART1 as DEBUG_LL possible target - Rename DEBUG_LL to indicate UART index * tag 'mvebu-soc-3.20' of git://git.infradead.org/linux-mvebu: ARM: mvebu: Update the SoC ID and revision definitions ARM: mvebu: Add UART1 as DEBUG_LL possible target ARM: mvebu: Rename DEBUG_LL to indicate UART index Signed-off-by: Olof Johansson --- 73298072885318557841a29dc0b99b5f0b4e2316