Conflicts: Documentation/feature-removal-schedule.txt drivers/net/e1000e/netdev.c net/xfrm/xfrm_policy.c |
||
|---|---|---|
| .. | ||
| amso1100 | ||
| cxgb3 | ||
| cxgb4 | ||
| ehca | ||
| ipath | ||
| mlx4 | ||
| mthca | ||
| nes | ||
| qib | ||
Conflicts: Documentation/feature-removal-schedule.txt drivers/net/e1000e/netdev.c net/xfrm/xfrm_policy.c |
||
|---|---|---|
| .. | ||
| amso1100 | ||
| cxgb3 | ||
| cxgb4 | ||
| ehca | ||
| ipath | ||
| mlx4 | ||
| mthca | ||
| nes | ||
| qib | ||