From: David S. Miller Date: Mon, 15 Dec 2014 16:50:50 +0000 (-0500) Subject: Merge branch 'macb' X-Git-Tag: firefly_0821_release~176^2~2631^2~21 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d2cdcdf56e27135bc48f82ade9636fc8b822e6a5;p=firefly-linux-kernel-4.4.55.git Merge branch 'macb' Cyrille Pitchen says: ==================== net/macb: fix multiqueue support patch up This series of patches is a fixup for the multiqueue support patch. The first patch fixes a bug introduced by the multiqueue support patch. The second one doesn't fix a bug but simplify the source code by removing useless calls to devm_free_irq() since we use managed device resources for IRQs. They were applied on the net-next tree and tested with a sama5d36ek board. ==================== Signed-off-by: David S. Miller --- d2cdcdf56e27135bc48f82ade9636fc8b822e6a5