diff options
author | David S. Miller <davem@davemloft.net> | 2012-07-20 11:11:59 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-07-20 11:11:59 -0700 |
commit | e4bce0f288bafd8505ba5ce9c5284a4478f1b725 (patch) | |
tree | 361c9647757df8a6f9dc40b738325f717d6aeabd /arch/.gitignore | |
parent | aac3942cedc339b1e7b6bad28f3abe4ceb15bcc3 (diff) | |
parent | a58915c7ecba89bef0914664ecf87c2156c68630 (diff) | |
download | linux-e4bce0f288bafd8505ba5ce9c5284a4478f1b725.tar.gz |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next
Jerr Kirsher says: ==================== This series contains updates to ixgbe. ... Alexander Duyck (9): ixgbe: Use VMDq offset to indicate the default pool ixgbe: Fix memory leak when SR-IOV VFs are direct assigned ixgbe: Drop references to deprecated pci_ DMA api and instead use dma_ API ixgbe: Cleanup configuration of FCoE registers ixgbe: Merge all FCoE percpu values into a single structure ixgbe: Make FCoE allocation and configuration closer to how rings work ixgbe: Correctly set SAN MAC RAR pool to default pool of PF ixgbe: Only enable anti-spoof on VF pools ixgbe: Enable FCoE FSO and CRC offloads based on CAPABLE instead of ENABLED flag ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/.gitignore')
0 files changed, 0 insertions, 0 deletions