]> www.infradead.org Git - users/willy/xarray.git/commitdiff
projects / users / willy / xarray.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 976f8be 7d13205)
Merge 3.10-rc6 into usb-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 17 Jun 2013 19:02:38 +0000 (12:02 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 17 Jun 2013 19:02:38 +0000 (12:02 -0700)
We want the fixes in this branch as well.

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

diff --cc drivers/usb/serial/f81232.c
Simple merge
diff --cc drivers/usb/serial/pl2303.c
Simple merge
XArray, radix tree and IDR