diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 22:44:18 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 22:44:18 +0100 |
commit | 43872fa788060eef91ae437957e0a5e39f1c56fd (patch) | |
tree | dba464da61167d84b4f7470edebd5a769a78f9ee /arch/arm/mach-imx/mach-armadillo5x0.c | |
parent | Merge branch 'pxa/fixes' into next/fixes (diff) | |
parent | ARM: 7104/1: plat-pxa: break out GPIO driver specifics (diff) | |
download | linux-43872fa788060eef91ae437957e0a5e39f1c56fd.tar.xz linux-43872fa788060eef91ae437957e0a5e39f1c56fd.zip |
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>
Diffstat (limited to 'arch/arm/mach-imx/mach-armadillo5x0.c')
0 files changed, 0 insertions, 0 deletions