Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...
authorDavid S. Miller <davem@davemloft.net>
Wed, 11 Dec 2013 17:57:57 +0000 (12:57 -0500)
committerDavid S. Miller <davem@davemloft.net>
Wed, 11 Dec 2013 17:57:57 +0000 (12:57 -0500)
commitd0977e2b85ab7966d1f8cd85a19ac5aa80793638
treeb22fc8b4782aa958b3d692caaf3daf7d0b580432
parent8afdd99a1315e759de04ad6e2344f0c5f17ecb1b
parent33457ff7cdd48c54723ab8c550deec28dd904659
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 <davem@davemloft.net>