From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 13 Oct 2011 06:25:45 +0000 (+1200)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: firefly_0821_release~3680^2~4363
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=37cf95162af4036b4198756a590aab8126fa2ce4;p=firefly-linux-kernel-4.4.55.git

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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
  mscan: too much data copied to CAN frame due to 16 bit accesses
  gro: refetch inet6_protos[] after pulling ext headers
  bnx2x: fix cl_id allocation for non-eth clients for NPAR mode
  mlx4_en: fix endianness with blue frame support
---

37cf95162af4036b4198756a590aab8126fa2ce4