diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-03-23 21:49:37 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-03-23 21:49:37 +0100 |
| commit | cd0e075784f4bce97b4ed47d4b354f045e895546 (patch) | |
| tree | 2354d4c2f5185c59dc21c537841b55c694cc53ec /drivers/net/ethernet/natsemi/macsonic.c | |
| parent | usb: phy: msm: Remove dead code (diff) | |
| parent | Linux 4.0-rc5 (diff) | |
| download | linux-cd0e075784f4bce97b4ed47d4b354f045e895546.tar.xz linux-cd0e075784f4bce97b4ed47d4b354f045e895546.zip | |
Merge 4.0-rc5 into usb-next
We want the USB fixes in here as well to resolve merge conflicts.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/ethernet/natsemi/macsonic.c')
0 files changed, 0 insertions, 0 deletions