diff options
author | 2013-08-25 12:43:44 -0700 | |
---|---|---|
committer | 2013-08-25 12:43:44 -0700 | |
commit | 5e25e4f304ce53004dcd01725938c0bc45c75d35 (patch) | |
tree | 16148e0ffcca471d0acf20fa7c9410e8c7704519 /tools/perf/util/scripting-engines/trace-event-python.c | |
parent | Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm (diff) | |
parent | usb: phy: fix build breakage (diff) | |
download | wireguard-linux-5e25e4f304ce53004dcd01725938c0bc45c75d35.tar.xz wireguard-linux-5e25e4f304ce53004dcd01725938c0bc45c75d35.zip |
Merge tag 'usb-3.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
Pull USB fixes from Greg KH:
"Here are two USB fixes for 3.11-rc7
One fixes a reported regression in the OHCI driver, and the other
fixes a reported build breakage in the USB phy drivers"
* tag 'usb-3.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
usb: phy: fix build breakage
USB: OHCI: add missing PCI PM callbacks to ohci-pci.c
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions