projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: eef9296 4cfe878)
Merge branch 'enic'
authorDavid S. Miller <davem@davemloft.net>
Mon, 23 Jun 2014 21:40:29 +0000 (14:40 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 23 Jun 2014 21:40:29 +0000 (14:40 -0700)
commitbb05ea7e59f26ebd7808bb39deb91b7f19f589b7
treec3f002369ac3d8c478efb797561e9069f7c35f98tree | snapshot (tar.gz zip)
parenteef929622b0ce86fcdaf6bd9ab6d7502470728d5commit | diff
parent4cfe878537cec0e9c0f84b93cc6aa9526f6942b5commit | diff
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>