From: David S. Miller <davem@davemloft.net>
Date: Mon, 23 Jun 2014 21:40:29 +0000 (-0700)
Subject: Merge branch 'enic'
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=bb05ea7e59f26ebd7808bb39deb91b7f19f589b7;p=linux-beck.git

Merge branch 'enic'

Govindarajulu Varadarajan says:

====================
enic updates

This series fixes minor bugs and adds new features like Accelerated RFS,
busy_poll, tx clean-up in napi_poll.

v3:
* While doing tx cleanup in napi, ignore budget and clean up all desc possible.

v2:
* Fix #ifdef coding style issue in '[PATCH 4/8] enic: alloc/free rx_cpu_rmap'
  And [PATCH 5/8] enic: Add Accelerated RFS support'
====================

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

bb05ea7e59f26ebd7808bb39deb91b7f19f589b7