From: Olof Johansson Date: Wed, 24 Feb 2016 07:59:29 +0000 (-0800) Subject: Merge tag 'mvebu-fixes-4.5-2' of git://git.infradead.org/linux-mvebu into fixes X-Git-Tag: v4.5-rc6~8^2~7 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=74a46ec6fbc1b410f3cbf897d3802c0bf554ea5a;p=linux-2.6-block.git Merge tag 'mvebu-fixes-4.5-2' of git://git.infradead.org/linux-mvebu into fixes mvebu fixes for 4.5 (part 2) - Fix the missing mtd flash on linkstation lswtgl - Use unique machine name for the kirkwood ds112 (for Debian flash-kernel tool) * tag 'mvebu-fixes-4.5-2' of git://git.infradead.org/linux-mvebu: ARM: dts: orion5x: fix the missing mtd flash on linkstation lswtgl ARM: dts: kirkwood: use unique machine name for ds112 Signed-off-by: Olof Johansson --- 74a46ec6fbc1b410f3cbf897d3802c0bf554ea5a