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

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

author	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Fri, 10 Feb 2012 19:12:55 +0000 (11:12 -0800)
committer	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Fri, 10 Feb 2012 19:13:53 +0000 (11:13 -0800)
commit	7483948fdd31a8642ef0288aab6f368b98d53c29
tree	031020a5553701d2aae8dddb0fa509aa65854eb1	tree \| snapshot (tar.gz zip)
parent	22a416c4e0f2179b57028e084ac0ed2c110333bd	commit \| diff
parent	fe250923bbbbcbccc9aa7b84d05ee7a060450534	commit \| diff

Merge tag 'usb-3.3-rc3' into usb-next

This is done to resolve a merge conflict with:
drivers/usb/class/cdc-wdm.c
and to better handle future patches for this driver as it is under
active development at the moment.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Motorola kernel-slsi

RSS Atom

drivers/usb/class/cdc-wdm.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ehci-fsl.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ehci-fsl.h	diff1 \|	diff2 \|	blob \| history
drivers/usb/serial/cp210x.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/serial/io_ti.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/storage/realtek_cr.c	diff1 \|	diff2 \|	blob \| history
include/linux/usb.h	diff1 \|	diff2 \|	blob \| history