From: David S. Miller Date: Fri, 16 May 2014 20:41:53 +0000 (-0400) Subject: Merge branch 'systemport-next' X-Git-Tag: firefly_0821_release~176^2~3765^2~208 X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=e0a1272cfacd53ff99c768b9e09b64cfdd77159c;p=firefly-linux-kernel-4.4.55.git Merge branch 'systemport-next' Florian Fainelli says: ==================== net: systemport: DMA and MAC fixes This patch series contains a critical fix in how the DMA unmapping of packet is done, as well as a less critical fix in how we disable the Ethernet MAC RX/TX functions. ==================== Signed-off-by: David S. Miller --- e0a1272cfacd53ff99c768b9e09b64cfdd77159c