Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
David S. Miller [Fri, 17 Jul 2009 03:21:24 +0000 (20:21 -0700)]
Conflicts:
drivers/net/wireless/orinoco/main.c

17 files changed:
1  2 
MAINTAINERS
drivers/net/8139too.c
drivers/net/bonding/bond_main.c
drivers/net/cs89x0.c
drivers/net/e100.c
drivers/net/fec.c
drivers/net/gianfar.c
drivers/net/isa-skeleton.c
drivers/net/plip.c
drivers/net/smc91x.c
drivers/net/usb/kaweth.c
drivers/net/usb/pegasus.c
drivers/net/via-rhine.c
drivers/net/wireless/orinoco/main.c
net/ipv4/ip_gre.c
net/ipv6/ip6_output.c
net/ipv6/sit.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc net/ipv6/sit.c
Simple merge