git.kernel.dk Git - linux-2.6-block.git/commit

author	David S. Miller <davem@davemloft.net>
	Fri, 8 Feb 2013 23:02:14 +0000 (18:02 -0500)
committer	David S. Miller <davem@davemloft.net>
	Fri, 8 Feb 2013 23:02:14 +0000 (18:02 -0500)
commit	fd5023111cf720db890ef34f305ac5d427e690a0
tree	4d21e9a02bfbdafe5fc598af0755db791238dbe7	tree \| snapshot
parent	8b9a4d56866e0dca6ae886ed9bff777e50d0b70c	commit \| diff
parent	836dc9e3fbbab0c30aa6e664417225f5c1fb1c39	commit \| diff

Merge git://git./linux/kernel/git/davem/net

Synchronize with 'net' in order to sort out some l2tp, wireless, and
ipv6 GRE fixes that will be built on top of in 'net-next'.

Signed-off-by: David S. Miller <davem@davemloft.net>

16 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/bcma/bcma_private.h	diff1 \|	diff2 \|	blob \| history
drivers/bcma/driver_gpio.c	diff1 \|	diff2 \|	blob \| history
drivers/bcma/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/cdc_ncm.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/brcm80211/brcmsmac/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/xen-netback/interface.c	diff1 \|	diff2 \|	blob \| history
drivers/ssb/driver_gpio.c	diff1 \|	diff2 \|	blob \| history
drivers/ssb/main.c	diff1 \|	diff2 \|	blob \| history
drivers/ssb/ssb_private.h	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_input.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_gre.c	diff1 \|	diff2 \|	blob \| history
net/l2tp/l2tp_core.c	diff1 \|	diff2 \|	blob \| history
net/sctp/auth.c	diff1 \|	diff2 \|	blob \| history

Linux 6.x block layer and io_uring tree(s)

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/bcma/bcma_private.h	diff1 \|	diff2 \|	blob \| history
drivers/bcma/driver_gpio.c	diff1 \|	diff2 \|	blob \| history
drivers/bcma/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/cdc_ncm.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/brcm80211/brcmsmac/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/xen-netback/interface.c	diff1 \|	diff2 \|	blob \| history
drivers/ssb/driver_gpio.c	diff1 \|	diff2 \|	blob \| history
drivers/ssb/main.c	diff1 \|	diff2 \|	blob \| history
drivers/ssb/ssb_private.h	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_input.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_gre.c	diff1 \|	diff2 \|	blob \| history
net/l2tp/l2tp_core.c	diff1 \|	diff2 \|	blob \| history
net/sctp/auth.c	diff1 \|	diff2 \|	blob \| history