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

Conflicts:
	drivers/net/usb/cdc_ether.c

All CDC ethernet devices of type USB_CLASS_COMM need to use
'&mbm_info'.

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/benet/be_cmds.h
Simple merge

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

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

diff --cc drivers/net/e1000e/e1000.h
Simple merge

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

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

diff --cc drivers/net/usb/cdc_ether.c
index 71e65fc10e6f35acbe893976288a570a730734c7,21e1ba160008921a2cea8b2618cd097fb10806c2..71d7ff3de99fd2fca985d10e19801333f238dddd
--- 1/drivers/net/usb/cdc_ether.c
--- 2/drivers/net/usb/cdc_ether.c
+++ b/drivers/net/usb/cdc_ether.c
@@@ -550,22 -542,62 +550,62 @@@ static const struct usb_device_id       produ
        /* Ericsson F3607gw */
        USB_DEVICE_AND_INTERFACE_INFO(0x0bdb, 0x1904, USB_CLASS_COMM,
                        USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
 -      .driver_info = (unsigned long) &cdc_info,
 +      .driver_info = (unsigned long) &mbm_info,
  }, {
-       /* Ericsson F3307 */
+       /* Ericsson F3607gw ver 2 */
+       USB_DEVICE_AND_INTERFACE_INFO(0x0bdb, 0x1905, USB_CLASS_COMM,
+                       USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
 -      .driver_info = (unsigned long) &cdc_info,
++      .driver_info = (unsigned long) &mbm_info,
+ }, {
+       /* Ericsson F3607gw ver 3 */
        USB_DEVICE_AND_INTERFACE_INFO(0x0bdb, 0x1906, USB_CLASS_COMM,
                        USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
 -      .driver_info = (unsigned long) &cdc_info,
 +      .driver_info = (unsigned long) &mbm_info,
+ }, {
+       /* Ericsson F3307 */
+       USB_DEVICE_AND_INTERFACE_INFO(0x0bdb, 0x190a, USB_CLASS_COMM,
+                       USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
 -      .driver_info = (unsigned long) &cdc_info,
++      .driver_info = (unsigned long) &mbm_info,
+ }, {
+       /* Ericsson F3307 ver 2 */
+       USB_DEVICE_AND_INTERFACE_INFO(0x0bdb, 0x1909, USB_CLASS_COMM,
+                       USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
 -      .driver_info = (unsigned long) &cdc_info,
++      .driver_info = (unsigned long) &mbm_info,
+ }, {
+       /* Ericsson C3607w */
+       USB_DEVICE_AND_INTERFACE_INFO(0x0bdb, 0x1049, USB_CLASS_COMM,
+                       USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
 -      .driver_info = (unsigned long) &cdc_info,
++      .driver_info = (unsigned long) &mbm_info,
  }, {
        /* Toshiba F3507g */
        USB_DEVICE_AND_INTERFACE_INFO(0x0930, 0x130b, USB_CLASS_COMM,
                        USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
 -      .driver_info = (unsigned long) &cdc_info,
 +      .driver_info = (unsigned long) &mbm_info,
+ }, {
+       /* Toshiba F3607gw */
+       USB_DEVICE_AND_INTERFACE_INFO(0x0930, 0x130c, USB_CLASS_COMM,
+                       USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
 -      .driver_info = (unsigned long) &cdc_info,
++      .driver_info = (unsigned long) &mbm_info,
+ }, {
+       /* Toshiba F3607gw ver 2 */
+       USB_DEVICE_AND_INTERFACE_INFO(0x0930, 0x1311, USB_CLASS_COMM,
+                       USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
 -      .driver_info = (unsigned long) &cdc_info,
++      .driver_info = (unsigned long) &mbm_info,
  }, {
        /* Dell F3507g */
        USB_DEVICE_AND_INTERFACE_INFO(0x413c, 0x8147, USB_CLASS_COMM,
                        USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
 -      .driver_info = (unsigned long) &cdc_info,
 +      .driver_info = (unsigned long) &mbm_info,
+ }, {
+       /* Dell F3607gw */
+       USB_DEVICE_AND_INTERFACE_INFO(0x413c, 0x8183, USB_CLASS_COMM,
+                       USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
 -      .driver_info = (unsigned long) &cdc_info,
++      .driver_info = (unsigned long) &mbm_info,
+ }, {
+       /* Dell F3607gw ver 2 */
+       USB_DEVICE_AND_INTERFACE_INFO(0x413c, 0x8184, USB_CLASS_COMM,
+                       USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
 -      .driver_info = (unsigned long) &cdc_info,
++      .driver_info = (unsigned long) &mbm_info,
  },
        { },            // END
  };

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

diff --cc drivers/net/wireless/ath/ath9k/rc.c
Simple merge

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

diff --cc drivers/net/wireless/libertas/if_usb.c
Simple merge

diff --cc firmware/Makefile
Simple merge

diff --cc firmware/WHENCE
Simple merge

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

diff --cc include/net/ip_fib.h
Simple merge

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

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

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

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

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

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

diff --cc net/ipv6/udp.c
Simple merge

diff --cc net/rose/rose_route.c
Simple merge

diff --cc net/sunrpc/svcsock.c
Simple merge

diff --cc net/wireless/sme.c
Simple merge