diff options
| author | David S. Miller <davem@davemloft.net> | 2014-12-09 13:15:51 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-12-09 13:15:51 -0500 |
| commit | 6000df00fd440b38cf41d435c3790e9cc12b447f (patch) | |
| tree | a017e63d3e95fee8ad1d98ead741305fcbac07e1 /lib/flex_array.c | |
| parent | a5a519b2710be43fce3cf9ce7bd8de8db3f2a9de (diff) | |
| parent | c153031773887fca473d25a2854cc37bd946c010 (diff) | |
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>
Diffstat (limited to 'lib/flex_array.c')
0 files changed, 0 insertions, 0 deletions