Sascha Hauer 18ea2863bf Merge branch 'for-next/omap' ... Conflicts: arch/arm/boards/beagle/board.c		2015-07-03 08:38:17 +02:00
..
defaultenv-beagle	ARM: beagleboard: Move to multiimage support	2015-07-02 09:17:56 +02:00
board.c	Merge branch 'for-next/omap'	2015-07-03 08:38:17 +02:00
lowlevel.c	ARM: beagleboard: Move to multiimage support	2015-07-02 09:17:56 +02:00
Makefile	ARM: beagleboard: Move to multiimage support	2015-07-02 09:17:56 +02:00