diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-25 21:41:02 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-25 21:41:02 +0100 |
| commit | 67635d397a643514fdfa859f611b86bd3ad8958d (patch) | |
| tree | b5df6d79b35cde39c00f0cc1432f128f473d4d6e /arch/arm/boot/dts/wm8650.dtsi | |
| parent | usb: enable usb port device's async suspend. (diff) | |
| parent | Linux 3.8-rc5 (diff) | |
| download | linux-67635d397a643514fdfa859f611b86bd3ad8958d.tar.xz linux-67635d397a643514fdfa859f611b86bd3ad8958d.zip | |
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>
Diffstat (limited to 'arch/arm/boot/dts/wm8650.dtsi')
0 files changed, 0 insertions, 0 deletions