6a06e5e1bb
Conflicts: drivers/net/team/team.c drivers/net/usb/qmi_wwan.c net/batman-adv/bat_iv_ogm.c net/ipv4/fib_frontend.c net/ipv4/route.c net/l2tp/l2tp_netlink.c The team, fib_frontend, route, and l2tp_netlink conflicts were simply overlapping changes. qmi_wwan and bat_iv_ogm were of the "use HEAD" variety. With help from Antonio Quartulli. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
---|---|---|
.. | ||
android | ||
asus_oled | ||
bcm | ||
ccg | ||
comedi | ||
cptm1217 | ||
crystalhd | ||
csr | ||
cxt1e1 | ||
echo | ||
et131x | ||
frontier | ||
ft1000 | ||
gdm72xx | ||
iio | ||
ipack | ||
keucr | ||
line6 | ||
media | ||
net | ||
nvec | ||
octeon | ||
olpc_dcon | ||
omap-thermal | ||
omapdrm | ||
ozwpan | ||
panel | ||
phison | ||
quickstart | ||
ramster | ||
rtl8187se | ||
rtl8192e | ||
rtl8192u | ||
rtl8712 | ||
rts5139 | ||
rts_pstor | ||
sbe-2t3e3 | ||
sep | ||
serqt_usb2 | ||
slicoss | ||
sm7xxfb | ||
speakup | ||
ste_rmi4 | ||
telephony | ||
tidspbridge | ||
usbip | ||
vme | ||
vt6655 | ||
vt6656 | ||
winbond | ||
wlags49_h2 | ||
wlags49_h25 | ||
wlan-ng | ||
xgifb | ||
zcache | ||
zram | ||
zsmalloc | ||
Kconfig | ||
Makefile | ||
staging.c |