Merge git://www.denx.de/git/u-boot Conflicts: drivers/Makefile
Merge commit '87ddedd'
drivers/pci : move pci drivers to drivers/pci Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
12345678910