tree bc62cbfc14296551caebda626db7a90fef9ae844
parent 5f7aac27b708f8618f6e698082982d9256543034
parent 020edd24c1b872a7faa41b0318863caa19e1dd7d
author Wolfgang Denk <wd@denx.de> 1301999060 +0200
committer Wolfgang Denk <wd@denx.de> 1301999060 +0200

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>