git.stricted.de - GitHub/moto-9609/android_kernel_motorola

projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commit

author	David S. Miller <davem@davemloft.net>
	Sat, 10 Nov 2012 23:32:51 +0000 (18:32 -0500)
committer	David S. Miller <davem@davemloft.net>
	Sat, 10 Nov 2012 23:32:51 +0000 (18:32 -0500)
commit	d4185bbf62a5d8d777ee445db1581beb17882a07
tree	024b0badbd7c970b1983be6d8c345cc4a290cb31	tree \| snapshot (tar.gz zip)
parent	c075b13098b399dc565b4d53f42047a8d40ed3ba	commit \| diff
parent	a375413311b39005ef281bfd71ae8f4e3df22e97	commit \| diff

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

Conflicts:
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c

Minor conflict between the BCM_CNIC define removal in net-next
and a bug fix added to net. Based upon a conflict resolution
patch posted by Stephen Rothwell.

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

34 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/m68k/include/uapi/asm/socket.h	\|	diff2 \|	blob \| history
arch/parisc/include/uapi/asm/socket.h	\|	diff2 \|	blob \| history
arch/xtensa/include/uapi/asm/socket.h	\|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/freescale/gianfar.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/micrel/ksz884x.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qla3xxx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/realtek/r8169.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ti/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/smsc95xx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/usbnet.c	diff1 \|	diff2 \|	blob \| history
drivers/net/vmxnet3/vmxnet3_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/net/vxlan.c	diff1 \|	diff2 \|	blob \| history
drivers/vhost/net.c	diff1 \|	diff2 \|	blob \| history
include/uapi/linux/usb/cdc.h	\|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/core/rtnetlink.c	diff1 \|	diff2 \|	blob \| history
net/core/skbuff.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/inet_diag.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_input.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_ipv4.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_minisocks.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_timer.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_gre.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ndisc.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/route.c	diff1 \|	diff2 \|	blob \| history
net/sctp/socket.c	diff1 \|	diff2 \|	blob \| history

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/m68k/include/uapi/asm/socket.h	\|	diff2 \|	blob \| history
arch/parisc/include/uapi/asm/socket.h	\|	diff2 \|	blob \| history
arch/xtensa/include/uapi/asm/socket.h	\|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/freescale/gianfar.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/micrel/ksz884x.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qla3xxx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/realtek/r8169.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ti/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/smsc95xx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/usbnet.c	diff1 \|	diff2 \|	blob \| history
drivers/net/vmxnet3/vmxnet3_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/net/vxlan.c	diff1 \|	diff2 \|	blob \| history
drivers/vhost/net.c	diff1 \|	diff2 \|	blob \| history
include/uapi/linux/usb/cdc.h	\|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/core/rtnetlink.c	diff1 \|	diff2 \|	blob \| history
net/core/skbuff.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/inet_diag.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_input.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_ipv4.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_minisocks.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_timer.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_gre.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ndisc.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/route.c	diff1 \|	diff2 \|	blob \| history
net/sctp/socket.c	diff1 \|	diff2 \|	blob \| history