Merge branch 'bgmac'
authorDavid S. Miller <davem@davemloft.net>
Mon, 19 Jan 2015 21:00:02 +0000 (16:00 -0500)
committerDavid S. Miller <davem@davemloft.net>
Mon, 19 Jan 2015 21:00:02 +0000 (16:00 -0500)
commite60bf80615e1b61e8de988d693478788628fa56a
treebac451207657fa0c6cbbbcd81e2752304d5d39af
parent852c5d9c98a0017d413ec99d6dccb206ccb2b96b
parent43f159c60a99318b1ef7d1d7c16c4dfdd06bfd90
Merge branch 'bgmac'

Hauke Mehrtens says:

====================
bgmac: some fixes to napi usage

I compared the napi documentation with the bgmac driver and found some
problems in that driver. These two patches should fix the problems.
====================

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