sugar/linux
1
0
Fork 0
Code Activity

Merge branch 'late/kirkwood' into late/soc

Browse Source 
Merge in the late Kirkwood branch with the OMAP late branch for upstream
submission.

Final contents described in shared tag.

Fixup remove/change conflicts in arch/arm/mach-omap2/devices.c and
drivers/spi/spi-omap2-mcspi.c.

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson
2012-10-04 20:17:25 -07:00
parent ad932bb6b5 46f2007c1e
commit 54d69df584
1353 changed files with 29880 additions and 31329 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-omap2/board-h4.c
View File

@@ -34,7 +34,7 @@
#include <plat/menelaus.h>
#include <plat/dma.h>
#include <plat/gpmc.h>
#include <plat/debug-devices.h>
#include "debug-devices.h"
#include <video/omapdss.h>
#include <video/omap-panel-generic-dpi.h>