]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit25bb88ce08da3b0e7dfc14eba7dfb2a579b91724
tree7e0d2cfb30f904ffbd2ac39a055cd53034c873b7
parent0aa7d48430a96f5d20980e2bc518c6342cd3877c
parentb8935c3f3faa419f9e5c18df633e5614d8965603
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