diff options
| author | David S. Miller <davem@davemloft.net> | 2016-05-17 21:11:19 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-05-17 21:11:19 +0300 |
| commit | 08a6ee5807711c4dfa0726e315864a408aa6c13c (patch) | |
| tree | 908cda03c0f0104845311cabe0fabd105755474f /drivers/net/ethernet/broadcom/bnxt/bnxt.h | |
| parent | 4c1cd4fdfd14ecd417962f8c2166506132697f7c (diff) | |
| parent | f79a917e69e1f5cd86e864b67f06147f1b0340f4 (diff) | |
| download | linux-08a6ee5807711c4dfa0726e315864a408aa6c13c.tar.xz | |
Merge tag 'net-next-qcom-soc-4.7-2-merge' of git://github.com/andersson/kernel
Merge tag 'qcom-soc-for-4.7-2' into net-next
This merges the Qualcomm SOC tree with the net-next, solving the
merge conflict in the SMD API between the two.
Diffstat (limited to 'drivers/net/ethernet/broadcom/bnxt/bnxt.h')
0 files changed, 0 insertions, 0 deletions