aboutsummaryrefslogtreecommitdiffstats
path: root/include/net/nfc/nfc.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2013-01-28 18:18:17 -0500
committerDavid S. Miller <davem@davemloft.net>2013-01-28 18:18:17 -0500
commit8a67b05db93688600ca330692b87668cad37e507 (patch)
treefdc45501bbcb351723c11f7cd74195ecc0c47075 /include/net/nfc/nfc.h
parent2bf3440d7b8755f2627232e6a4c37efbbe053685 (diff)
parent8d56b6d507e0c4f6e24680fd202cbaad445935c5 (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next
Jeff Kirsher says: ==================== This series contains updates to e1000e, ixgbevf, igb and igbvf. Majority of the patches are code cleanups of e1000e where code is removed (Yeah!). The other two e1000e patches are fixes. The first is to fix the maximum frame size for 82579 devices. The second fix is to resolve an issue with devices other than 82579 that suffer from dropped transactions on platforms with deep C-states when jumbo frames are enabled. The ixgbevf patch is to ensure that the driver fetches the correct, refreshed value for link status and speed when the values have changed. The igb and igbvf patches are a solution to an issue Stefan Assmann reported, where when the PF is up and igbvf is loaded, the MAC address is not generated using eth_hw_addr_random(). ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/nfc/nfc.h')
0 files changed, 0 insertions, 0 deletions