[U-Boot] Pull request: u-boot-usb

[Wolfgang Denk <wd@denx.de>]

Dear Remy Bohmer,

In message <CANqCtQ+6EwsY7kBTc0cd01r38md0gmD8tPvS2A36xwV+8LVBvg@mail.gmail.com> you wrote:
> The following changes since commit c4eba6ec5c58083b38340724c006294c7a4fe2eb:
> 
>   common/usb_kbd.c: fix bug introduced in commit 00b7d6e (2011-12-09
> 12:09:35 +0100)
> 
> are available in the git repository at:
>   git://git.denx.de/u-boot-usb.git master

Sorry, this collides with other changes to
arch/arm/include/asm/arch-exynos/cpu.h (i. e. the rename of S5PC210
into EXYNOS4).

Most of the conflicts are trivial to resolve, but old
S5PC210_PHY_BASE (versus new EXYNOS4_USBPHY_BASE) and old
S5PC210_USB_PHY_CONTROL (no new correspondence) may require changes
in other parts of the code, too.

Can you please rebase and resubmit?

Sorry for the inconvenience.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
I've got to get something inside me. Some coffee  or  something.  And
then the world will somehow be better.
                                     - Terry Pratchett, _Men at Arms_