From: David S. Miller <davem@davemloft.net>
Date: Thu, 5 Sep 2013 16:39:39 +0000 (-0400)
Subject: Merge branch 'enic'
X-Git-Tag: firefly_0821_release~176^2~5420^2~13
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c3de991feb5f785175ca3fc1ea30e21c1086a109;p=firefly-linux-kernel-4.4.55.git

Merge branch 'enic'

Govindarajulu Varadarajan says:

====================
The following patch adds multi tx support for enic.

Signed-off-by: Nishank Trivedi <nistrive@cisco.com>
Signed-off-by: Christian Benvenuti <benve@cisco.com>
Signed-off-by: Govindarajulu Varadarajan <govindarajulu90@gmail.com>
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

c3de991feb5f785175ca3fc1ea30e21c1086a109