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

Conflicts:
	drivers/net/can/Kconfig

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/can/Kconfig
index c16e6ff139d038e9e602f52f78bb3be5772819ed,772f6d2489ce4047ad60c6ae6d5cd23b9adfe11b..732b093e081509cf67d9f2e9b4e11b9e060356e6
--- 1/drivers/net/can/Kconfig
--- 2/drivers/net/can/Kconfig
+++ b/drivers/net/can/Kconfig
@@@ -95,38 -41,10 +41,42 @@@ config CAN_AT9
        ---help---
          This is a driver for the SoC CAN controller in Atmel's AT91SAM9263.
  
 +config CAN_TI_HECC
 +      depends on CAN_DEV && ARCH_OMAP3
 +      tristate "TI High End CAN Controller"
 +      ---help---
 +        Driver for TI HECC (High End CAN Controller) module found on many
 +        TI devices. The device specifications are available from www.ti.com
 +
 +config CAN_MCP251X
 +      tristate "Microchip MCP251x SPI CAN controllers"
 +      depends on CAN_DEV && SPI
 +      ---help---
 +        Driver for the Microchip MCP251x SPI CAN controllers.
 +
 +config CAN_MSCAN
 +      depends on CAN_DEV && (PPC || M68K || M68KNOMMU)
 +      tristate "Support for Freescale MSCAN based chips"
 +      ---help---
 +        The Motorola Scalable Controller Area Network (MSCAN) definition
 +        is based on the MSCAN12 definition which is the specific
 +        implementation of the Motorola Scalable CAN concept targeted for
 +        the Motorola MC68HC12 Microcontroller Family.
 +
 +config CAN_MPC52XX
 +      tristate "Freescale MPC5xxx onboard CAN controller"
 +      depends on CAN_MSCAN && PPC_MPC52xx
 +      ---help---
 +        If you say yes here you get support for Freescale's MPC52xx
 +        onboard dualCAN controller.
 +
 +        This driver can also be built as a module.  If so, the module
 +        will be called mpc5xxx_can.
 +
+ source "drivers/net/can/sja1000/Kconfig"
+ 
+ source "drivers/net/can/usb/Kconfig"
+ 
  config CAN_DEBUG_DEVICES
        bool "CAN devices debugging messages"
        depends on CAN

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

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

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

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

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

diff --cc drivers/net/wireless/ipw2x00/ipw2200.c
Simple merge

diff --cc net/bluetooth/l2cap.c
Simple merge

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

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

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

diff --cc net/sctp/socket.c
Simple merge