git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit

]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit

author	David S. Miller <davem@davemloft.net>
	Mon, 24 Oct 2011 22:18:09 +0000 (18:18 -0400)
committer	David S. Miller <davem@davemloft.net>
	Mon, 24 Oct 2011 22:18:09 +0000 (18:18 -0400)
commit	1805b2f04855f07afe3a71d620a68f483b0ed74f
tree	b823b90f37f5404fcaef70f785c70112ca74a329	tree
parent	78d81d15b74246c7cedf84894434890b33da3907	commit \| diff
parent	f42af6c486aa5ca6ee62800cb45c5b252020509d	commit \| diff

Merge branch 'master' of ra.kernel.org:/pub/scm/linux/kernel/git/davem/net

21 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/mips/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/bonding/bond_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/can/mscan/mscan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x.h	diff1 \|	\|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h	diff1 \|	\|	blob \| history
drivers/net/ethernet/broadcom/tg3.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/jme.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/mellanox/mlx4/en_tx.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/realtek/r8169.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/smsc/smsc911x.c	diff1 \|	\|	blob \| history
drivers/net/ppp/pptp.c	diff1 \|	\|	blob \| history
include/linux/skbuff.h	diff1 \|	diff2 \|	blob \| history
kernel/sys.c	diff1 \|	diff2 \|	blob \| history
net/batman-adv/translation-table.c	diff1 \|	diff2 \|	blob \| history
net/bridge/br_if.c	diff1 \|	diff2 \|	blob \| history
net/bridge/br_private.h	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/core/fib_rules.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_minisocks.c	diff1 \|	diff2 \|	blob \| history

Ubuntu Disco kernel mirror for Proxmox VE and PMG

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/mips/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/bonding/bond_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/can/mscan/mscan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x.h	diff1 \|	\|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h	diff1 \|	\|	blob \| history
drivers/net/ethernet/broadcom/tg3.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/jme.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/mellanox/mlx4/en_tx.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/realtek/r8169.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/smsc/smsc911x.c	diff1 \|	\|	blob \| history
drivers/net/ppp/pptp.c	diff1 \|	\|	blob \| history
include/linux/skbuff.h	diff1 \|	diff2 \|	blob \| history
kernel/sys.c	diff1 \|	diff2 \|	blob \| history
net/batman-adv/translation-table.c	diff1 \|	diff2 \|	blob \| history
net/bridge/br_if.c	diff1 \|	diff2 \|	blob \| history
net/bridge/br_private.h	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/core/fib_rules.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_minisocks.c	diff1 \|	diff2 \|	blob \| history