From: David S. Miller Date: Wed, 11 Dec 2013 17:57:57 +0000 (-0500) Subject: Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville... X-Git-Tag: firefly_0821_release~176^2~4771^2~20 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d0977e2b85ab7966d1f8cd85a19ac5aa80793638;p=firefly-linux-kernel-4.4.55.git Merge branch 'for-davem' of git://git./linux/kernel/git/linville/wireless John W. Linville says: ==================== Just one patch this time -- a fix from Felix Fietkau to fix the duration calculation for non-aggregated packets in ath9k. This is a small change and it is obviously specific to ath9k. Please let me know if there are problems! ==================== Signed-off-by: David S. Miller --- d0977e2b85ab7966d1f8cd85a19ac5aa80793638