tree 867b60d92db4fd9ac99bda532c7290fe564d0821
parent 477de0de446210eb5c87e2a54c9ba4c8844fb98b
parent 6f404e441d169afc90929ef5e451ec9779c1f11a
author Linus Torvalds <torvalds@linux-foundation.org> 1305596288 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1305596288 -0700

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: Change netdev_fix_features messages loglevel
  vmxnet3: Fix inconsistent LRO state after initialization
  sfc: Fix oops in register dump after mapping change
  IPVS: fix netns if reading ip_vs_* procfs entries
  bridge: fix forwarding of IPv6