]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commited22825fe53cffb0d408e34919fff37a292515bc
treef573761ac752ff04ec445e23aef50adadda49790
parent6f97033d577ed577bce035107166e1b3f4aa4f4d
parent2d3f37927dfc3fd0e1743f190bc888ca995a9738
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