git.agner.ch Git - linux.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	8a1629c771b1a60bc6d73394d869fe69b13200dc
tree	12f68138d95b70d450ab418fdfb300ebdcd2f003	tree \| snapshot
parent	04aebcbb1b6dccadc8862b2765265f65a946db57	commit \| diff
parent	693d92a1bbc9e42681c42ed190bd42b636ca876f	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 tree with some unpolished code for Colibri/Apalis modules

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