Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

Conflicts:
	drivers/usb/host/ehci-pci.c

Signed-off-by: Wolfgang Denk <wd@denx.de>

diff --cc boards.cfg
Simple merge

diff --cc drivers/usb/host/ehci-pci.c
index 2b68f7bd19eafe03c23faf0cabfe9b0a612a2c79,bf490b0d32cd45062b29da4b4e201f86a0e2ea46..4abe5e3b59a56946515ee1fff790d713d3973f3b
--- 1/drivers/usb/host/ehci-pci.c
--- 2/drivers/usb/host/ehci-pci.c
+++ b/drivers/usb/host/ehci-pci.c
@@@ -28,8 -28,8 +28,9 @@@
  #ifdef CONFIG_PCI_EHCI_DEVICE
  static struct pci_device_id ehci_pci_ids[] = {
        /* Please add supported PCI EHCI controller ids here */
 -      {0x1033, 0x00E0},
 -      {0x10b9, 0x5239},       /* ULI1575 PCI EHCI module ids */
 +      {0x1033, 0x00E0},       /* NEC */
++      {0x10B9, 0x5239},       /* ULI1575 PCI EHCI module ids */
 +      {0x12D8, 0x400F},       /* Pericom */
        {0, 0}
  };
  #endif