| commit | 74a46ec6fbc1b410f3cbf897d3802c0bf554ea5a | [log] [tgz] |
|---|---|---|
| author | Olof Johansson <olof@lixom.net> | Tue Feb 23 23:59:29 2016 -0800 |
| committer | Olof Johansson <olof@lixom.net> | Wed Feb 24 00:04:59 2016 -0800 |
| tree | fd69e69449f38a535bb158ef00b2016289150c4f | |
| parent | 81f70ba233d5f660e1ea5fe23260ee323af5d53a [diff] | |
| parent | 44361a2cc13493fc41216d33bb9a562ec3a9cc4e [diff] |
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 <olof@lixom.net>