tree dba464da61167d84b4f7470edebd5a769a78f9ee
parent 91fed558d0f33c74477569f50ed883fe6d430f1f
parent f55be1bf52aad524dc1bf556ae26c90262c87825
author Arnd Bergmann <arnd@arndb.de> 1320097458 +0100
committer Arnd Bergmann <arnd@arndb.de> 1320097458 +0100

Merge branch 'depends/rmk/gpio' into next/fixes

This sorts out merge conflicts with the arm/gpio branch that
already got merged into mainline Linux.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>