summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/colibri-pxa300.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2013-02-28 18:53:01 +0100
committerArnd Bergmann <arnd@arndb.de>2013-02-28 18:53:01 +0100
commit168268a225d24da3768a88c1029fb3014b0837ca (patch)
treeafde019a1ac79366df0b96a2fcc8ba50bc5298fa /arch/arm/mach-pxa/colibri-pxa300.c
parent04ee16bdf486061147c608410c2c9181352aaa3a (diff)
parent6f1989bc982bc176b0d63e028e9b7f23ae1b4583 (diff)
Merge 'mmc/upstream' into late/mvebu2
These patches from the mmc tree were merged into v3.9 already and the later mvebu patches depend on them. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-pxa/colibri-pxa300.c')
0 files changed, 0 insertions, 0 deletions