]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commit
Merge branch 'omap/headers4' into next/drivers
authorArnd Bergmann <arnd@arndb.de>
Thu, 15 Nov 2012 16:18:30 +0000 (17:18 +0100)
committerArnd Bergmann <arnd@arndb.de>
Thu, 15 Nov 2012 16:18:30 +0000 (17:18 +0100)
commitcf1fb2dfa7601770037d24a328f259e2cfd97fb0
tree1a38c170cc73ca9fa02b69a3194f487b0c1ef55c
parentc9b1c7b34a17742054e2b967f7c126964343e4f2
parent6ba54ab4a49bbad736b0254aa6bdf0cb83013815
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>