tmakin/tegra-linux-noble
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'v3.17-rc5' into next

Browse Source 
Linux 3.17-rc5

Signed-off-by: Felipe Balbi <balbi@ti.com>

Conflicts:
	Documentation/devicetree/bindings/usb/mxs-phy.txt
	drivers/usb/phy/phy-mxs-usb.c
This commit is contained in:
Felipe Balbi
2014-09-16 09:53:59 -05:00
parent d9152161b4 9e82bf0141
commit 4cd41ffd27
331 changed files with 3960 additions and 2086 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/usb/usbip/libsrc/usbip_common.h
View File

@@ -15,7 +15,7 @@
#include <syslog.h>
#include <unistd.h>
#include <linux/usb/ch9.h>
#include "../../uapi/usbip.h"
#include <linux/usbip.h>
#ifndef USBIDS_FILE
#define USBIDS_FILE "/usr/share/hwdata/usb.ids"