00
committer Arnd Bergmann <arnd@arndb.de> 1352996310 +0100

Merge branch 'omap/headers4' into next/drivers

This avoids merge conflicts between the omap header changes and the gpmc
updates.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>