diff options
author | John W. Linville <linville@tuxdriver.com> | 2014-05-08 11:13:41 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2014-05-08 11:13:41 -0400 |
commit | 6153871f77f8fa778cd0cf1e2979db75e25d3532 (patch) | |
tree | c6024da3b1ee5ce379b3c60824aabba76a1e1799 /drivers/net/ethernet/intel/i40evf/i40e_type.h | |
parent | net: mdio: of_mdiobus_register(): fall back to mdiobus_register() for !CONFIG_OF (diff) | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211 (diff) | |
download | linux-dev-6153871f77f8fa778cd0cf1e2979db75e25d3532.tar.xz linux-dev-6153871f77f8fa778cd0cf1e2979db75e25d3532.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'drivers/net/ethernet/intel/i40evf/i40e_type.h')
0 files changed, 0 insertions, 0 deletions