git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
52a962f
53e4096
)
Merge branch 'ehci'
author
Tony Lindgren
<tony@atomide.com>
Tue, 22 Sep 2009 01:21:58 +0000
(18:21 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Tue, 22 Sep 2009 01:21:58 +0000
(18:21 -0700)
Conflicts:
arch/arm/mach-omap2/Makefile
arch/arm/mach-omap2/board-3430sdp.c
arch/arm/mach-omap2/board-omap3beagle.c
arch/arm/mach-omap2/board-omap3evm.c
arch/arm/mach-omap2/board-omap3pandora.c
arch/arm/mach-omap2/usb-ehci.c
arch/arm/plat-omap/include/mach/omap34xx.h
arch/arm/plat-omap/include/mach/usb.h
drivers/usb/host/ehci-omap.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff