Merge branch 'devel-cleanup' into omap-for-linus
authorTony Lindgren <tony@atomide.com>
Thu, 3 Mar 2011 01:07:14 +0000 (17:07 -0800)
committerTony Lindgren <tony@atomide.com>
Thu, 3 Mar 2011 01:07:14 +0000 (17:07 -0800)
commit12d7d4e0ed8fecf7f74c89483b55b300be6e5901
treef573761ac752ff04ec445e23aef50adadda49790
parentaca6ad073ea820776bf5bdb87cf82eace35042c8
parent790ab7e92bec24aee3939b300d36b99ab2e3f3ca
Merge branch 'devel-cleanup' into omap-for-linus

Conflicts:
arch/arm/mach-omap2/timer-gp.c
arch/arm/mach-omap2/mailbox.c
arch/arm/mach-omap2/timer-gp.c
drivers/usb/musb/musb_core.c
drivers/usb/musb/musb_core.h