Merge branch 'for-tony' of master.kernel.org:/pub/scm/linux/kernel/git/balbi/usb...
authorTony Lindgren <tony@atomide.com>
Tue, 24 May 2011 07:04:49 +0000 (00:04 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 24 May 2011 07:04:49 +0000 (00:04 -0700)
commitb7679ab3f70482ff4b75a8c735c8224ebedb6020
tree39fba8d730b08ce79090dab49851adffe13dc329
parentb08827f4c7a5020855abe0f9b1a316f11275b76b
parent208466dc10083e734a8af71d10f923ee4bff950c
Merge branch 'for-tony' of /linux/kernel/git/balbi/usb into omap-for-linus
arch/arm/mach-omap2/board-am3517evm.c
arch/arm/mach-omap2/usb-musb.c