summaryrefslogtreecommitdiff
path: root/drivers/pcmcia/pxa2xx_cm_x2xx.c
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-10-15 01:24:42 +0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-10-15 01:24:42 +0400
commitb6825d2df55aa7d7341c715b577b73a6a03dc944 (patch)
treeae4f0f52f4c2ad4e501dd323318486ccdd7fcd93 /drivers/pcmcia/pxa2xx_cm_x2xx.c
parent6defd90433729c2d795865165cb34d938d8ff07c (diff)
parentaa59e19d05114f9fb7718d6bc8398255476fb4f5 (diff)
downloadlinux-b6825d2df55aa7d7341c715b577b73a6a03dc944.tar.xz
Merge branch 'omap-all' into devel
Conflicts: arch/arm/mach-omap2/gpmc.c arch/arm/mach-omap2/irq.c
Diffstat (limited to 'drivers/pcmcia/pxa2xx_cm_x2xx.c')
0 files changed, 0 insertions, 0 deletions