git.stricted.de - GitHub/MotorolaMobilityLLC/kernel-slsi.git/commit

projects / GitHub / MotorolaMobilityLLC / kernel-slsi.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: c6a389f 55a4626)

author	Greg Kroah-Hartman <gregkh@suse.de>
	Mon, 29 Aug 2011 15:56:17 +0000 (08:56 -0700)
committer	Greg Kroah-Hartman <gregkh@suse.de>
	Mon, 29 Aug 2011 15:56:17 +0000 (08:56 -0700)
commit	6ed962a208cb72cff29a107d6c73247526017ddb
tree	2bd574d8ab1db79b369735ba0519a66760019189	tree \| snapshot (tar.gz zip)
parent	c6a389f123b9f68d605bb7e0f9b32ec1e3e14132	commit \| diff
parent	55a46269ccedec140e2487a2344e8a247d48b385	commit \| diff

Merge 3.1-rc4 into usb-next

This was done to resolve a conflict in this file:
drivers/usb/host/xhci-ring.c

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

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ehci-hub.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ehci-s5p.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/xhci-ring.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/xhci.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/musb/musb_gadget.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/serial/ftdi_sio.c	diff1 \|	diff2 \|	blob \| history

Motorola kernel-slsi