From: David S. Miller Date: Mon, 19 Jan 2015 21:00:02 +0000 (-0500) Subject: Merge branch 'bgmac' X-Git-Tag: firefly_0821_release~176^2~2492^2~2 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e60bf80615e1b61e8de988d693478788628fa56a;p=firefly-linux-kernel-4.4.55.git 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 --- e60bf80615e1b61e8de988d693478788628fa56a