summaryrefslogtreecommitdiff
path: root/arch/arm/mach-imx/mach-cpuimx51sd.c
diff options
context:
space:
mode:
authorJens Axboe <axboe@kernel.dk>2012-07-24 13:15:08 +0200
committerJens Axboe <axboe@kernel.dk>2012-07-24 13:15:08 +0200
commitb1af9be5ef77898c05667bb9dbf3b180d91d3292 (patch)
tree5c267d1d43d89fe51d9385a2401f3343ec2a856c /arch/arm/mach-imx/mach-cpuimx51sd.c
parenta051661ca6d134c18599498b185b667859d4339b (diff)
parent0cc15d03bcccdf95e2bd82e094e6064e61b54207 (diff)
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/floppy into for-3.6/drivers
Diffstat (limited to 'arch/arm/mach-imx/mach-cpuimx51sd.c')
0 files changed, 0 insertions, 0 deletions