diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-23 08:20:44 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-23 08:21:03 -0800 |
| commit | c69263c66e5b2a5d0c7e5a41c189b1846ae1de92 (patch) | |
| tree | 81c6cf0f5b3b05739e2e73b0118077d9dd245182 /net/batman-adv/hard-interface.h | |
| parent | 45196cee28a5bcfb6ddbe2bffa4270cbed66ae4b (diff) | |
| parent | 5407a3c3d942e75d4d123d213fd692bce5acc961 (diff) | |
Merge branch 'usb-3.3-rc4' into usb-next
This is to pull in the xhci changes and the other fixes and device id
updates that were done in Linus's tree.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/batman-adv/hard-interface.h')
0 files changed, 0 insertions, 0 deletions