diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-13 15:22:54 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-13 15:22:54 -0700 |
| commit | e17f8af316525c2a795bb314dfcc23201fb51ef4 (patch) | |
| tree | 99ea9c56dc9e8fc6485d0513e71aacdb50a19792 /scripts/mod/file2alias.c | |
| parent | USB: option: use usb_{get,set}_serial_data (diff) | |
| parent | USB: serial-generic: use a single set of device IDs (diff) | |
| download | linux-e17f8af316525c2a795bb314dfcc23201fb51ef4.tar.gz linux-e17f8af316525c2a795bb314dfcc23201fb51ef4.zip | |
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>
Diffstat (limited to 'scripts/mod/file2alias.c')
0 files changed, 0 insertions, 0 deletions