From: David S. Miller <davem@davemloft.net>
Date: Wed, 21 May 2014 21:04:42 +0000 (-0400)
Subject: Merge branch 'enic-next'
X-Git-Tag: v3.16-rc1~27^2~181
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=21ea04fa2d26906a2c8bca40891a238414111f5f;p=platform%2Fkernel%2Flinux-exynos.git

Merge branch 'enic-next'

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>
---

21ea04fa2d26906a2c8bca40891a238414111f5f