diff options
| author | Jon Medhurst <tixy@linaro.org> | 2014-09-11 08:45:49 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2014-09-11 08:45:49 +0100 |
| commit | a91b0779035581ed2da7e7f223793778c3c26cea (patch) | |
| tree | 75b724373f6b780a341fdc015da5e3aebd3c1f45 /drivers/ide/ide-floppy.c | |
| parent | 0be6ea5e50115b082d10f4bf04191986ca30eabd (diff) | |
| parent | 6fab6dee14b73cddacd3f6fc5793e602181b11bb (diff) | |
Merge branch 'tracking-armlt-juno' into integration-linaro-vexpress
Conflicts:
arch/arm64/boot/dts/Makefile
Diffstat (limited to 'drivers/ide/ide-floppy.c')
0 files changed, 0 insertions, 0 deletions