summaryrefslogtreecommitdiffstats
path: root/tools/hv
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-09-17 05:42:46 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-09-17 05:42:46 +0200
commit2bcb132c693566bcb8208cc7ce66b72a4f852ecf (patch)
tree6fc4f05ce18140d86aa78a10380a610734aeaef9 /tools/hv
parentUSB: serial: io_ti.c: remove dbg() usage (diff)
parentLinux 3.6-rc6 (diff)
downloadlinux-2bcb132c693566bcb8208cc7ce66b72a4f852ecf.tar.xz
linux-2bcb132c693566bcb8208cc7ce66b72a4f852ecf.zip
Merge 3.6-rc6 into usb-next
This resolves the merge problems with: drivers/usb/dwc3/gadget.c drivers/usb/musb/tusb6010.c that had been seen in linux-next. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools/hv')
0 files changed, 0 insertions, 0 deletions