| commit | 67635d397a643514fdfa859f611b86bd3ad8958d | [log] [tgz] |
|---|---|---|
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Fri Jan 25 12:41:02 2013 -0800 |
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Fri Jan 25 12:41:02 2013 -0800 |
| tree | b5df6d79b35cde39c00f0cc1432f128f473d4d6e | |
| parent | 192fef18d0f5ac9a05a93ff6314fc9865c10fbf9 [diff] | |
| parent | 949db153b6466c6f7cad5a427ecea94985927311 [diff] |
Merge 3.8-rc5 into usb-next This fixes up a conflict with drivers/usb/serial/io_ti.c that came up in linux-next. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>