Merge git://git.denx.de/u-boot into x1
authorMarkus Klotzbuecher <mk@denx.de>
Tue, 21 Oct 2008 07:18:01 +0000 (09:18 +0200)
committerMarkus Klotzbuecher <mk@denx.de>
Tue, 21 Oct 2008 07:18:01 +0000 (09:18 +0200)
commit50bd0057ba8fceeb48533f8b1a652ccd0e170838
treeea1a183343573c2a48248923b96d316c0956727c
parent9dbc366744960013965fce8851035b6141f3b3ae
parentf82642e33899766892499b163e60560fbbf87773
Merge git://git.denx.de/u-boot into x1

Conflicts:

drivers/usb/usb_ohci.c
board/MAI/AmigaOneG3SE/usb_uhci.c
board/mpl/common/usb_uhci.c
cpu/ppc4xx/usb_ohci.c
drivers/usb/usb_ohci.c
drivers/usb/usb_ohci.h