]> Pileus Git - ~andy/linux/commit
Merge branch 'usb-linus' into usb-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 13 Jun 2012 22:22:54 +0000 (15:22 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 13 Jun 2012 22:22:54 +0000 (15:22 -0700)
commite17f8af316525c2a795bb314dfcc23201fb51ef4
tree99ea9c56dc9e8fc6485d0513e71aacdb50a19792
parenta276400d14bb5b98a5db1d87bbee7b1621abe4a1
parent0b84704a2d6fdf55a3dcdd2a1f2ac8b48913c84b
Merge branch 'usb-linus' into usb-next

This is to pick up the changes to the option driver, which are needed
for follow-on patches from Johan.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/serial/option.c
include/linux/usb/hcd.h