Merge branch 'enic-next'
authorDavid S. Miller <davem@davemloft.net>
Wed, 21 May 2014 21:04:42 +0000 (17:04 -0400)
committerDavid S. Miller <davem@davemloft.net>
Wed, 21 May 2014 21:04:42 +0000 (17:04 -0400)
Govindarajulu Varadarajan says:

====================
enic: Add adaptive coalescing interrupt support

This series add support for adaptive coalescing interrupt and updates
enic Maintainers.

v1->v2:
* Add commit log
* do vnic_intr_coalescing_timer_set only while enabling intr
* use ktime_get instead of hrtimer
* make enic_set_rx_coal_setting return type void
* change func name enic_apply_int_moderation to enic_calc_int_moderation
====================

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

Trivial merge