diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-13 15:10:01 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-13 15:10:12 -0800 |
| commit | 50e5dfb6c4111c860bfa4d93dfe115bedf6b0fb1 (patch) | |
| tree | 1785659e73faee5968c2f4fb1a1a18bb77c22ca3 /sound/oss | |
| parent | 5ee71cf3bef66ad9683c681e48628fae057f8e18 (diff) | |
| parent | b7bc5925a9aafae970c3db1f118c97a7d503114e (diff) | |
Merge branch 'usb-linus' into usb-next
This is needed so that Sarah can queue up some xhci changes for 3.4
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound/oss')
0 files changed, 0 insertions, 0 deletions