summaryrefslogtreecommitdiff
path: root/arch/arm/mach-mx5
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-11-01 01:44:18 +0400
committerArnd Bergmann <arnd@arndb.de>2011-11-01 01:44:18 +0400
commit43872fa788060eef91ae437957e0a5e39f1c56fd (patch)
treedba464da61167d84b4f7470edebd5a769a78f9ee /arch/arm/mach-mx5
parent91fed558d0f33c74477569f50ed883fe6d430f1f (diff)
parentf55be1bf52aad524dc1bf556ae26c90262c87825 (diff)
downloadlinux-43872fa788060eef91ae437957e0a5e39f1c56fd.tar.xz
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-mx5')
0 files changed, 0 insertions, 0 deletions