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

diff --cc MAINTAINERS
index 28421c22ebae940d8e3a2ddc71e72111c9b2bae6,abedca58d8bd31b596eb8dc0736428982820a4c3..cb44e1cb076a20831ffa9a181975f247203b6e82
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -3729,8 -4600,9 +4600,9 @@@ F:      drivers/net/r6040.
  RDS - RELIABLE DATAGRAM SOCKETS
  P:    Andy Grover
  M:    andy.grover@oracle.com
 -L:    rds-devel@oss.oracle.com
 +L:    rds-devel@oss.oracle.com (moderated for non-subscribers)
  S:    Supported
+ F:    net/rds/
  
  READ-COPY UPDATE (RCU)
  P:    Dipankar Sarma

diff --cc drivers/net/fec.c
Simple merge

diff --cc drivers/net/ixgbe/ixgbe_82598.c
Simple merge

diff --cc drivers/net/ixgbe/ixgbe_82599.c
Simple merge

diff --cc drivers/net/ixgbe/ixgbe_common.c
Simple merge

diff --cc drivers/net/ixgbe/ixgbe_main.c
Simple merge

diff --cc net/8021q/vlan_core.c
Simple merge

diff --cc net/core/dev.c
Simple merge