From: David S. Miller <davem@davemloft.net>
Date: Tue, 9 Dec 2014 18:15:51 +0000 (-0500)
Subject: Merge branch 'amd-xgbe'
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6000df00fd440b38cf41d435c3790e9cc12b447f;p=linux-beck.git

Merge branch 'amd-xgbe'

Tom Lendacky says:

====================
amd-xgbe: AMD XGBE driver fixes 2014-12-02

The following series of patches includes two bug fixes. Unfortunately,
the first patch will create a conflict when eventually merged into
net-next but should be very easy to resolve.

- Do not clear the interrupt bit in the xgbe_ring_data structure
- Associate a Tx SKB with the proper xgbe_ring_data structure

This patch series is based on net.
====================

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

6000df00fd440b38cf41d435c3790e9cc12b447f