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

diff --cc MAINTAINERS
index 5008b087cb742905f0dd11bbf6ee666ec64b7e80,b3bc88d9c03ac68f7dd5512400c8852577268e9f..bb4a83af08f25c052fe7a7e9f27ecb23f729598f
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -2468,10 -2460,10 +2468,10 @@@ S:   Supporte
  F:    drivers/infiniband/hw/ehca/
  
  EHEA (IBM pSeries eHEA 10Gb ethernet adapter) DRIVER
- M:    Breno Leitao <leitao@linux.vnet.ibm.com>
+ M:    Thadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com>
  L:    netdev@vger.kernel.org
  S:    Maintained
 -F:    drivers/net/ehea/
 +F:    drivers/net/ethernet/ibm/ehea/
  
  EMBEDDED LINUX
  M:    Paul Gortmaker <paul.gortmaker@windriver.com>

diff --cc arch/mips/Kconfig
Simple merge

diff --cc drivers/net/bonding/bond_main.c
Simple merge

diff --cc drivers/net/can/mscan/mscan.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
Simple merge

diff --cc drivers/net/ethernet/broadcom/tg3.c
Simple merge

diff --cc drivers/net/ethernet/jme.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx4/en_tx.c
Simple merge

diff --cc drivers/net/ethernet/realtek/r8169.c
Simple merge

diff --cc drivers/net/ethernet/smsc/smsc911x.c
Simple merge

diff --cc drivers/net/ppp/pptp.c
Simple merge

diff --cc include/linux/skbuff.h
Simple merge

diff --cc kernel/sys.c
Simple merge

diff --cc net/batman-adv/translation-table.c
Simple merge

diff --cc net/bridge/br_if.c
Simple merge

diff --cc net/bridge/br_private.h
Simple merge

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

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

diff --cc net/ipv4/route.c
Simple merge

diff --cc net/ipv4/tcp_minisocks.c
Simple merge