Merge branch 'for-tony' of git://gitorious.org/usb/usb into omap-for-linus
authorTony Lindgren <tony@atomide.com>
Tue, 22 Feb 2011 18:54:12 +0000 (10:54 -0800)
committerTony Lindgren <tony@atomide.com>
Tue, 22 Feb 2011 18:54:12 +0000 (10:54 -0800)
commit04aa67dec63b61c1a8b9b6d001262250f1a92130
tree7e0d2cfb30f904ffbd2ac39a055cd53034c873b7
parent3b03b58dab847883e6b9a431558c7d8e43fa94c6
parent18a26892d62d2786c2b259ba4605ee10bba0ba13
Merge branch 'for-tony' of git://gitorious.org/usb/usb into omap-for-linus

Conflicts:
arch/arm/mach-omap2/omap_hwmod_2430_data.c
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
arch/arm/mach-omap2/Makefile
arch/arm/mach-omap2/board-4430sdp.c
arch/arm/mach-omap2/board-am3517evm.c
arch/arm/mach-omap2/omap_hwmod_2430_data.c
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c