Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Fri, 17 Jul 2009 03:21:24 +0000 (20:21 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 17 Jul 2009 03:21:24 +0000 (20:21 -0700)
commitda8120355e80ddaf534adb8ed910871d97512d56
tree9958a6c33e29b5af5faccf6650e98729151618a2
parentc86ae82605ef92594a0de809a8c588ae955fed63
parent7fefe6a88494b00b151b5ca7bb84daaa781bbca7
Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
drivers/net/wireless/orinoco/main.c
17 files changed:
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