]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commit - arch/arm/mach-omap2/usb-ehci.c
projects / linux-2.6-omap-h63xx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 15b747f 94aca1d)
Merge current mainline tree into linux-omap tree
authorTony Lindgren <tony@atomide.com>
Fri, 3 Oct 2008 13:19:58 +0000 (16:19 +0300)
committerTony Lindgren <tony@atomide.com>
Fri, 3 Oct 2008 13:19:58 +0000 (16:19 +0300)
commit708244b3f3d5dad958059729c384a068ecd46161
treee62eca736a0a5e0cfd4b92e1015af442490ec345tree | snapshot
parent15b747f2edae17ec86b42a7bddc135190854b189commit | diff
parent94aca1dac6f6d21f4b07e4864baf7768cabcc6e7commit | diff
Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:

drivers/usb/musb/musb_core.c
Makefile diff1 | diff2 | blob | history
drivers/usb/gadget/omap_udc.c diff1 | diff2 | blob | history
drivers/usb/host/ehci-hcd.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.