From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 18 Sep 2011 18:02:26 +0000 (-0700)
Subject: Merge git://github.com/davem330/net
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b0e7031ac08fa0aa242531c8d9a0cf9ae8ee276d;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge git://github.com/davem330/net

* git://github.com/davem330/net: (62 commits)
  ipv6: don't use inetpeer to store metrics for routes.
  can: ti_hecc: include linux/io.h
  IRDA: Fix global type conflicts in net/irda/irsysctl.c v2
  net: Handle different key sizes between address families in flow cache
  net: Align AF-specific flowi structs to long
  ipv4: Fix fib_info->fib_metrics leak
  caif: fix a potential NULL dereference
  sctp: deal with multiple COOKIE_ECHO chunks
  ibmveth: Fix checksum offload failure handling
  ibmveth: Checksum offload is always disabled
  ibmveth: Fix issue with DMA mapping failure
  ibmveth: Fix DMA unmap error
  pch_gbe: support ML7831 IOH
  pch_gbe: added the process of FIFO over run error
  pch_gbe: fixed the issue which receives an unnecessary packet.
  sfc: Use 64-bit writes for TX push where possible
  Revert "sfc: Use write-combining to reduce TX latency" and follow-ups
  bnx2x: Fix ethtool advertisement
  bnx2x: Fix 578xx link LED
  bnx2x: Fix XMAC loopback test
  ...
---

b0e7031ac08fa0aa242531c8d9a0cf9ae8ee276d