| commit | cf1fb2dfa7601770037d24a328f259e2cfd97fb0 | |
| author | Arnd Bergmann <arnd@arndb.de> | |
| Thu, 15 Nov 2012 16:18:30 +0000 (15 17:18 +0100) | ||
| committer | Arnd Bergmann <arnd@arndb.de> | |
| Thu, 15 Nov 2012 16:18:30 +0000 (15 17:18 +0100) | ||
| tree | 1a38c170cc73ca9fa02b69a3194f487b0c1ef55c | treesnapshot (tar.gz zip) |
| parent | c9b1c7b34a17742054e2b967f7c126964343e4f2 | commitdiff |
| parent | 6ba54ab4a49bbad736b0254aa6bdf0cb83013815 | commitdiff |
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>
This avoids merge conflicts between the omap header changes and the gpmc
updates.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>