This sorts out merge conflicts with the arm/gpio branch that
already got merged into mainline Linux.
Signed-off-by: NArnd Bergmann <arnd@arndb.de>