summaryrefslogtreecommitdiff
path: root/arch/arm/mach-mxs/devices-mx23.h
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-11-01 02:46:42 +0400
committerArnd Bergmann <arnd@arndb.de>2011-11-01 02:46:42 +0400
commitefa62e1355f0495f37f1296754b8880947c8da72 (patch)
treec07af29f8baf2e6f4ed3bedbe46d405924edd530 /arch/arm/mach-mxs/devices-mx23.h
parent107532920226a37e595697959b2a6a823cfa2497 (diff)
parentf55be1bf52aad524dc1bf556ae26c90262c87825 (diff)
downloadlinux-efa62e1355f0495f37f1296754b8880947c8da72.tar.xz
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>
Diffstat (limited to 'arch/arm/mach-mxs/devices-mx23.h')
0 files changed, 0 insertions, 0 deletions