From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 24 Feb 2010 03:44:07 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: MMI-PSA29.97-13-9~24911
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=75ef7cdda2daa35be9e070ac8e5258759ac03d06;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge git://git./linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  net: bug fix for vlan + gro issue
  tc35815: Remove a wrong netif_wake_queue() call which triggers BUG_ON
  cdc_ether: new PID for Ericsson C3607w to the whitelist (resubmit)
  IPv6: better document max_addresses parameter
  MAINTAINERS: update mv643xx_eth maintenance status
  e1000: Fix DMA mapping error handling on RX
  iwlwifi: sanity check before counting number of tfds can be free
  iwlwifi: error checking for number of tfds in queue
  iwlwifi: set HT flags after channel in rxon
---

75ef7cdda2daa35be9e070ac8e5258759ac03d06