Merge git://git.denx.de/u-boot-marvell
authorTom Rini <trini@konsulko.com>
Fri, 10 Jul 2015 13:40:48 +0000 (09:40 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 10 Jul 2015 13:40:48 +0000 (09:40 -0400)
1  2 
drivers/block/ahci.c

Simple merge