Home
last modified time | relevance | path

Searched hist:fc293f5f2a2d94b889666c3dc3faa09f6b55e3e3 (Results 1 – 2 of 2) sorted by relevance

/linux/arch/arm/mach-shmobile/
H A DMakefilediff fc293f5f2a2d94b889666c3dc3faa09f6b55e3e3 Tue Aug 11 14:43:05 CEST 2015 Olof Johansson <olof@lixom.net> ARM: shmobile: Fix mismerges

Turns out I fumbled a couple of the merge resolutions for marzen board removal.

Signed-off-by: Olof Johansson <olof@lixom.net>
/linux/arch/arm/boot/dts/
H A DMakefilediff fc293f5f2a2d94b889666c3dc3faa09f6b55e3e3 Tue Aug 11 14:43:05 CEST 2015 Olof Johansson <olof@lixom.net> ARM: shmobile: Fix mismerges

Turns out I fumbled a couple of the merge resolutions for marzen board removal.

Signed-off-by: Olof Johansson <olof@lixom.net>