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: omap-for-v3.8/fixes-for-merge-window-v4-signed~41^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf1fb2dfa7601770037d24a328f259e2cfd97fb0;p=pandora-kernel.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
Reading git-diff-tree failed