| commit | efa62e1355f0495f37f1296754b8880947c8da72 | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Mon Oct 31 23:46:42 2011 +0100 |
| committer | Arnd Bergmann <arnd@arndb.de> | Mon Oct 31 23:46:42 2011 +0100 |
| tree | c07af29f8baf2e6f4ed3bedbe46d405924edd530 | |
| parent | 107532920226a37e595697959b2a6a823cfa2497 [diff] | |
| parent | f55be1bf52aad524dc1bf556ae26c90262c87825 [diff] |
Merge branch 'depends/rmk/gpio' into next/devel Conflicts: arch/arm/mach-mxs/include/mach/gpio.h arch/arm/plat-mxc/include/mach/gpio.h Signed-off-by: Arnd Bergmann <arnd@arndb.de>