tree fc7838e872b182cf6c061a681881c9c5a406489e
parent be64c970f601d5bb439b6cc88ea2bd208b3422a0
parent c4d49794ff2838038fd9756eae39c39a5a685833
author Linus Torvalds <torvalds@linux-foundation.org> 1266983047 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1266983047 -0800

Merge git://git.kernel.org/pub/scm/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