Olof Johansson fc293f5f2a 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>		2015-08-11 14:43:09 +02:00
..
bootp	…
compressed	ARM: shmobile: Remove obsolete zboot support	2015-07-06 09:29:45 +09:00
dts	ARM: shmobile: Fix mismerges	2015-08-11 14:43:09 +02:00
.gitignore	…
Makefile	kbuild: use relative path to include Makefile	2015-04-02 16:42:08 +02:00
install.sh	…