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 --combined WHENCE
index a07aede9fcc3c6d9b3c887bffc93098b266bbeef,7a8adc06eb34b964ffe5479a464a08a698a33a32..34b5d0a036db7856389e8a92f8ff5cd08450f16b
--- 1/WHENCE
--- 2/WHENCE
+++ b/WHENCE
@@@ -600,6 -600,7 +600,7 @@@ File: cis/LA-PCM.ci
        cis/DP83903.cis
        cis/NE2K.cis
        cis/tamarack.cis
+       cis/PE-200.cis
  
  Licence: GPL
  
@@@ -633,6 -634,9 +634,9 @@@ File: cis/MT5634ZLX.ci
        cis/RS-COM-2P.cis
        cis/COMpad2.cis
        cis/COMpad4.cis
+       cis/SW_555_SER.cis
+       cis/SW_7xx_SER.cis
+       cis/SW_8xx_SER.cis
  
  Licence: GPL
  
@@@ -674,8 -678,8 +678,8 @@@ Found in hex form in kernel source
  
  Driver: bnx2x: Broadcom Everest
  
 -File: bnx2x-e1-4.8.53.0.fw.ihex
 -File: bnx2x-e1h-4.8.53.0.fw.ihex
 +File: bnx2x-e1-5.2.7.0.fw.ihex
 +File: bnx2x-e1h-5.2.7.0.fw.ihex
  
  License:
    Copyright (c) 2007-2009 Broadcom Corporation