From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 9 Apr 2009 00:43:58 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: upstream/snapshot3+hdmi~19252
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c71d9caf6cfdee56da2924a054cc84cbe91d82b6;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  igb: remove sysfs entry that was used to set the number of vfs
  igbvf: add new driver to support 82576 virtual functions
  drivers/net/eql.c: Fix a dev leakage.
  niu: Fix unused variable warning.
  r6040: set MODULE_VERSION
  bnx2: Don't use reserved names
  FEC driver: add missing #endif
  niu: Fix error handling
  mv643xx_eth: don't reset the rx coal timer on interface up
  smsc911x: correct debugging message on mii read timeout
  ethoc: fix library build errors
  netfilter: ctnetlink: fix regression in expectation handling
  netfilter: fix selection of "LED" target in netfilter
  netfilter: ip6tables regression fix
---

c71d9caf6cfdee56da2924a054cc84cbe91d82b6