diff options
| author | David S. Miller <davem@davemloft.net> | 2014-06-05 15:26:58 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-06-05 15:26:58 -0700 |
| commit | 54a4ca8e3730257c89272f08e24d26d4c2165a76 (patch) | |
| tree | ba938311d429b48ec1ebe57a336d5872ef723565 /net/netfilter/xt_state.c | |
| parent | e0a47d1f781665d2aa126b804572314d128a0070 (diff) | |
| parent | 45198c7b35c00488cb33fb1f3fccd4e97a9a8abb (diff) | |
Merge branch 'amd-xgbe'
Tom Lendacky says:
====================
amd-xgbe: AMD 10Gb Ethernet driver
The following series implements support for the new AMD 10Gb Ethernet
driver (amd-xgbe). It includes the 10Gb Ethernet driver as well as
a 10Gb Ethernet PHY driver.
This patch series is based on net-next.
Changes in V3:
- Add OF dependency to the phylib driver configuration
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter/xt_state.c')
0 files changed, 0 insertions, 0 deletions