mirror of
https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git
synced 2024-09-22 12:24:38 +00:00
11fe883936
Conflicts:
drivers/vhost/net.c
net/bridge/br_device.c
Fix merge conflict in drivers/vhost/net.c with guidance from
Stephen Rothwell.
Revert the effects of net-2.6 commit
|
||
---|---|---|
.. | ||
dsa.c | ||
dsa_priv.h | ||
Kconfig | ||
Makefile | ||
mv88e6xxx.c | ||
mv88e6xxx.h | ||
mv88e6060.c | ||
mv88e6123_61_65.c | ||
mv88e6131.c | ||
slave.c | ||
tag_dsa.c | ||
tag_edsa.c | ||
tag_trailer.c |