From: Arnd Bergmann Date: Thu, 15 Nov 2012 16:18:30 +0000 (+0100) Subject: Merge branch 'omap/headers4' into next/drivers X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=cf1fb2dfa7601770037d24a328f259e2cfd97fb0;p=linux.git 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 --- cf1fb2dfa7601770037d24a328f259e2cfd97fb0