]> www.infradead.org Git - users/hch/block.git/commitdiff
projects / users / hch / block.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 626f090 c095ba7)
Merge 3.11-rc4 into usb-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 5 Aug 2013 00:36:14 +0000 (08:36 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 5 Aug 2013 00:36:14 +0000 (08:36 +0800)
We want those fixes in here also.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1  2 
MAINTAINERS patch | diff1 | diff2 | blob | history
drivers/usb/serial/ftdi_sio.c patch | diff1 | diff2 | blob | history
drivers/usb/serial/mos7840.c patch | diff1 | diff2 | blob | history

diff --cc MAINTAINERS
Simple merge
diff --cc drivers/usb/serial/ftdi_sio.c
Simple merge
diff --cc drivers/usb/serial/mos7840.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.