From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 15 Nov 2012 16:18:30 +0000 (+0100)
Subject: Merge branch 'omap/headers4' into next/drivers
X-Git-Tag: firefly_0821_release~3680^2~1476^2~4
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=cf1fb2dfa7601770037d24a328f259e2cfd97fb0;p=firefly-linux-kernel-4.4.55.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 <arnd@arndb.de>
---

cf1fb2dfa7601770037d24a328f259e2cfd97fb0