| commit | e17f8af316525c2a795bb314dfcc23201fb51ef4 | [log] [tgz] |
|---|---|---|
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Wed Jun 13 15:22:54 2012 -0700 |
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Wed Jun 13 15:22:54 2012 -0700 |
| tree | 99ea9c56dc9e8fc6485d0513e71aacdb50a19792 | |
| parent | a276400d14bb5b98a5db1d87bbee7b1621abe4a1 [diff] | |
| parent | 0b84704a2d6fdf55a3dcdd2a1f2ac8b48913c84b [diff] |
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>