mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-06 08:46:46 +00:00
143c905494
Conflicts: drivers/net/ethernet/intel/i40e/i40e_main.c drivers/net/macvtap.c Both minor merge hassles, simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
---|---|---|
.. | ||
configs | ||
hpux | ||
include | ||
kernel | ||
lib | ||
math-emu | ||
mm | ||
oprofile | ||
defpalo.conf | ||
install.sh | ||
Kconfig | ||
Kconfig.debug | ||
Makefile | ||
nm |