summaryrefslogtreecommitdiff
path: root/drivers/media/platform/Makefile
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-03-07 16:12:43 -0500
committerDavid S. Miller <davem@davemloft.net>2014-03-07 16:12:43 -0500
commit91bd66e4c8e0042fdea945c5e455363f1d44959a (patch)
treecf25a02f9ac75813e41b1ad554ea771d0f4a30da /drivers/media/platform/Makefile
parent389400428953bb002b173fa07d16d7a6f120843f (diff)
parent2062862a46b6ba35368449ec8d719cfdf467a912 (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next
Jeff Kirsher says: ==================== Intel Wired LAN Driver Updates This series contains updates to i40e and i40evf. Most notable are: Joseph completes the implementation of the ethtool ntuple rule management interface by adding the get, update and delete interface reset. Akeem provides a fix to prevent a possible overflow due to multiplication of number and size by using kzalloc, so use kcalloc. Jesse provides an implementation for skb_set_hash() and adds the L4 type return when we know it is an L4 hash. He also adds a counter to statistics for Tx timeouts to help users. Lastly he provides a change to stay away from the cache line where the done bit may be getting written back for the transmit ring since the hardware may be writing the whole cache line for a partial update. Shannon cleans up code comments. Anjali removes a firmware workaround for newer firmware since the number of MSIx vectors are being reported correctly. v2: - dropped patch 01 of the series based on feedback from the author Joe Perches and Shannon Nelson. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/media/platform/Makefile')
0 files changed, 0 insertions, 0 deletions