mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-18 15:09:53 +00:00
56a4342dfe
Conflicts: drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c net/ipv6/ip6_tunnel.c net/ipv6/ip6_vti.c ipv6 tunnel statistic bug fixes conflicting with consolidation into generic sw per-cpu net stats. qlogic conflict between queue counting bug fix and the addition of multiple MAC address support. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
|---|---|---|
| .. | ||
| android | ||
| bcm | ||
| btmtk_usb | ||
| ced1401 | ||
| comedi | ||
| cptm1217 | ||
| crystalhd | ||
| cxt1e1 | ||
| dgap | ||
| dgnc | ||
| dgrp | ||
| dwc2 | ||
| echo | ||
| et131x | ||
| frontier | ||
| ft1000 | ||
| fwserial | ||
| gdm72xx | ||
| gdm724x | ||
| goldfish | ||
| iio | ||
| imx-drm | ||
| keucr | ||
| line6 | ||
| lustre | ||
| media | ||
| mt29f_spinand | ||
| netlogic | ||
| nvec | ||
| octeon | ||
| octeon-usb | ||
| olpc_dcon | ||
| ozwpan | ||
| panel | ||
| phison | ||
| quickstart | ||
| rtl8187se | ||
| rtl8188eu | ||
| rtl8192e | ||
| rtl8192u | ||
| rtl8712 | ||
| rts5139 | ||
| sb105x | ||
| sbe-2t3e3 | ||
| sep | ||
| serqt_usb2 | ||
| silicom | ||
| slicoss | ||
| sm7xxfb | ||
| speakup | ||
| ste_rmi4 | ||
| tidspbridge | ||
| usbip | ||
| vme | ||
| vt6655 | ||
| vt6656 | ||
| winbond | ||
| wlags49_h2 | ||
| wlags49_h25 | ||
| wlan-ng | ||
| xgifb | ||
| xillybus | ||
| zram | ||
| zsmalloc | ||
| Kconfig | ||
| Makefile | ||
| staging.c | ||