projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 73bc7d3 90a8a73)
USB: Merge 2.6.37-rc5 into usb-next
authorGreg Kroah-Hartman <gregkh@suse.de>
Wed, 22 Dec 2010 20:25:34 +0000 (12:25 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Wed, 22 Dec 2010 20:25:34 +0000 (12:25 -0800)
commit2af10844eb6ed104f9505bf3a7ba3ceb02264f31
tree8a00024ff525b22379ea90a78ac3222db5a73062tree | snapshot (tar.gz zip)
parent73bc7d315f56e260071bdb5f15e25b53bddc1402commit | diff
parent90a8a73c06cc32b609a880d48449d7083327e11acommit | diff
USB: Merge 2.6.37-rc5 into usb-next

This is to resolve the conflict in the file,
drivers/usb/gadget/composite.c that was due to a revert in Linus's tree
needed for the 2.6.37 release.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/usb/gadget/composite.c diff1 | diff2 | blob | history
drivers/usb/serial/ftdi_sio.c diff1 | diff2 | blob | history