diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-10 20:12:55 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-10 20:13:53 +0100 |
| commit | 7483948fdd31a8642ef0288aab6f368b98d53c29 (patch) | |
| tree | 031020a5553701d2aae8dddb0fa509aa65854eb1 /sound/pci/maestro3.c | |
| parent | USB: serial: use dev_err_console in custom write paths (diff) | |
| parent | Merge tag 'usb-3.3-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/greg... (diff) | |
| download | linux-7483948fdd31a8642ef0288aab6f368b98d53c29.tar.xz linux-7483948fdd31a8642ef0288aab6f368b98d53c29.zip | |
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>
Diffstat (limited to 'sound/pci/maestro3.c')
0 files changed, 0 insertions, 0 deletions