Merge branch 'enic'
authorDavid S. Miller <davem@davemloft.net>
Thu, 5 Sep 2013 16:39:39 +0000 (12:39 -0400)
committerDavid S. Miller <davem@davemloft.net>
Thu, 5 Sep 2013 16:39:39 +0000 (12:39 -0400)
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>

Trivial merge