git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	David S. Miller <davem@davemloft.net>
	Fri, 6 Nov 2009 08:55:55 +0000 (00:55 -0800)
committer	David S. Miller <davem@davemloft.net>
	Fri, 6 Nov 2009 08:55:55 +0000 (00:55 -0800)
commit	0e0fe15b486cccef19adbabac34974597bef1555
tree	9d2690917533bbb4498c8c9df838de2d38360912	tree \| snapshot
parent	4a6204dc038a5e0c2174038e07a794f76591747f	commit \| diff
parent	4411264ce70be4106fc3b39659e1e340bb02baba	commit \| diff

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

Conflicts:
drivers/net/usb/cdc_ether.c

All CDC ethernet devices of type USB_CLASS_COMM need to use
'&mbm_info'.

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

26 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/benet/be_cmds.h	diff1 \|	diff2 \|	blob \| history
drivers/net/davinci_emac.c	diff1 \|	diff2 \|	blob \| history
drivers/net/e100.c	diff1 \|	diff2 \|	blob \| history
drivers/net/e1000e/e1000.h	diff1 \|	diff2 \|	blob \| history
drivers/net/r8169.c	diff1 \|	diff2 \|	blob \| history
drivers/net/sky2.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/cdc_ether.c	diff1 \|	diff2 \|	blob \| history
drivers/net/virtio_net.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/rc.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ipw2x00/ipw2200.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/libertas/if_usb.c	diff1 \|	diff2 \|	blob \| history
firmware/Makefile	diff1 \|	diff2 \|	blob \| history
firmware/WHENCE	diff1 \|	diff2 \|	blob \| history
include/linux/skbuff.h	diff1 \|	diff2 \|	blob \| history
include/net/ip_fib.h	diff1 \|	diff2 \|	blob \| history
net/bridge/br_if.c	diff1 \|	diff2 \|	blob \| history
net/core/datagram.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/fib_frontend.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ip_gre.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/udp.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/udp.c	diff1 \|	diff2 \|	blob \| history
net/rose/rose_route.c	diff1 \|	diff2 \|	blob \| history
net/sunrpc/svcsock.c	diff1 \|	diff2 \|	blob \| history
net/wireless/sme.c	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/benet/be_cmds.h	diff1 \|	diff2 \|	blob \| history
drivers/net/davinci_emac.c	diff1 \|	diff2 \|	blob \| history
drivers/net/e100.c	diff1 \|	diff2 \|	blob \| history
drivers/net/e1000e/e1000.h	diff1 \|	diff2 \|	blob \| history
drivers/net/r8169.c	diff1 \|	diff2 \|	blob \| history
drivers/net/sky2.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/cdc_ether.c	diff1 \|	diff2 \|	blob \| history
drivers/net/virtio_net.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/rc.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ipw2x00/ipw2200.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/libertas/if_usb.c	diff1 \|	diff2 \|	blob \| history
firmware/Makefile	diff1 \|	diff2 \|	blob \| history
firmware/WHENCE	diff1 \|	diff2 \|	blob \| history
include/linux/skbuff.h	diff1 \|	diff2 \|	blob \| history
include/net/ip_fib.h	diff1 \|	diff2 \|	blob \| history
net/bridge/br_if.c	diff1 \|	diff2 \|	blob \| history
net/core/datagram.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/fib_frontend.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ip_gre.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/udp.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/udp.c	diff1 \|	diff2 \|	blob \| history
net/rose/rose_route.c	diff1 \|	diff2 \|	blob \| history
net/sunrpc/svcsock.c	diff1 \|	diff2 \|	blob \| history
net/wireless/sme.c	diff1 \|	diff2 \|	blob \| history