From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 12 Oct 2008 18:40:34 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: firefly_0821_release~17815
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=589acce53e235055806e81e330af1e8f115bfcc2;p=firefly-linux-kernel-4.4.55.git

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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  smc911x: Fix external PHY detection
  e1000: allow VLAN devices to use TSO and CSUM offload
  gre: Initialise rtnl_link tunnel parameters properly
  ipvs: Add proper dependencies on IP_VS, and fix description header line.
---

589acce53e235055806e81e330af1e8f115bfcc2