| commit | 7483948fdd31a8642ef0288aab6f368b98d53c29 | [log] [tgz] |
|---|---|---|
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Fri Feb 10 11:12:55 2012 -0800 |
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Fri Feb 10 11:13:53 2012 -0800 |
| tree | 031020a5553701d2aae8dddb0fa509aa65854eb1 | |
| parent | 22a416c4e0f2179b57028e084ac0ed2c110333bd [diff] | |
| parent | fe250923bbbbcbccc9aa7b84d05ee7a060450534 [diff] |
Merge tag 'usb-3.3-rc3' into usb-next This is done to resolve a merge conflict with: drivers/usb/class/cdc-wdm.c and to better handle future patches for this driver as it is under active development at the moment. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>