git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	Greg Kroah-Hartman <gregkh@suse.de>
	Tue, 10 May 2011 20:30:45 +0000 (13:30 -0700)
committer	Greg Kroah-Hartman <gregkh@suse.de>
	Tue, 10 May 2011 20:30:45 +0000 (13:30 -0700)
commit	965b808246ff833352cb3d679f7a8bcd8ad414bd
tree	12f68138d95b70d450ab418fdfb300ebdcd2f003	tree \| snapshot
parent	c431d0ac38f0868a0c47fd706ac46d2f01aa376c	commit \| diff
parent	2787d12aaa42cb4b78bad463394a382a6cb6cadc	commit \| diff

Merge branch 2.6.39-rc7 into usb-linus

This was needed to resolve a conflict in:
drivers/usb/host/isp1760-hcd.c

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Linux Kernel Source Tree.

RSS Atom

drivers/usb/host/ehci-omap.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/xhci-hub.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/musb/musb_gadget.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/musb/omap2430.c	diff1 \|	diff2 \|	blob \| history