diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-05-25 12:53:19 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-05-25 12:53:19 +0400 |
| commit | 256e5d8c3f7bae348b2115e0323ef9e836eb4d47 (patch) | |
| tree | 354d0743226588e414e0d2a917418b3eb904695f /drivers/ata/ahci.c | |
| parent | b068b1e7d514d8806623ece2fc76aacf523f487d (diff) | |
| parent | 2be12549c900303c418fcbb7044979e190fd4e7e (diff) | |
Merge remote-tracking branch 'nico/iks' into lsk-3.9-vexpress-iks
Conflicts:
arch/arm/Kconfig
arch/arm/common/Makefile
Diffstat (limited to 'drivers/ata/ahci.c')
0 files changed, 0 insertions, 0 deletions