871039f02f
Conflicts: drivers/net/stmmac/stmmac_main.c drivers/net/wireless/wl12xx/wl1271_cmd.c drivers/net/wireless/wl12xx/wl1271_main.c drivers/net/wireless/wl12xx/wl1271_spi.c net/core/ethtool.c net/mac80211/scan.c |
||
|---|---|---|
| .. | ||
| arlan | ||
| asus_oled | ||
| batman-adv | ||
| comedi | ||
| crystalhd | ||
| cx25821 | ||
| dream | ||
| dt3155 | ||
| echo | ||
| et131x | ||
| frontier | ||
| go7007 | ||
| hv | ||
| iio | ||
| line6 | ||
| netwave | ||
| octeon | ||
| otus | ||
| panel | ||
| phison | ||
| poch | ||
| pohmelfs | ||
| quatech_usb2 | ||
| ramzswap | ||
| rar_register | ||
| rt2860 | ||
| rt2870 | ||
| rt3070 | ||
| rtl8187se | ||
| rtl8192e | ||
| rtl8192su | ||
| rtl8192u | ||
| samsung-laptop | ||
| sep | ||
| serqt_usb2 | ||
| slicoss | ||
| sm7xx | ||
| strip | ||
| udlfb | ||
| usbip | ||
| vme | ||
| vt6655 | ||
| vt6656 | ||
| wavelan | ||
| winbond | ||
| wlags49_h2 | ||
| wlags49_h25 | ||
| wlan-ng | ||
| Kconfig | ||
| Makefile | ||
| staging.c | ||