Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 13 Oct 2011 06:25:45 +0000 (18:25 +1200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 13 Oct 2011 06:25:45 +0000 (18:25 +1200)
commit37cf95162af4036b4198756a590aab8126fa2ce4
tree373166854c78072bda9f7c834bef819e92a56fc3
parent1d1136012163ab5e33a97f9779af269cf4049cb9
parenta3a4bfde8a271df7ee56fcf31b8d907d50e7f216
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