Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
authorWolfgang Denk <wd@denx.de>
Tue, 5 Apr 2011 10:24:20 +0000 (12:24 +0200)
committerWolfgang Denk <wd@denx.de>
Tue, 5 Apr 2011 10:24:20 +0000 (12:24 +0200)
commit4db2fa7f9446d0f2fe8db3d62184b1212fe22707
treebc62cbfc14296551caebda626db7a90fef9ae844
parent75df0d594990875419121c6f8687472ac9f4ae7a
parent7d3053fbf16caad4745f42f7ae3e38e9d3e964b5
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>
boards.cfg
drivers/usb/host/ehci-pci.c