tree 3bce45825a2700e1cbc75f488728ec02801bb3d3
parent e5778ec91e823b97262f045814d34d0abde689c0
parent c2d42545774c4bba7232521d836d0793330e3a4e
author Linus Torvalds <torvalds@linux-foundation.org> 1219711687 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1219711687 -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:
  bnx2x: Version update
  bnx2x: Multi Queue
  bnx2x: NAPI and interrupts enable/disable
  bnx2x: NIC load failure cleanup
  bnx2x: Initialization structure
  bnx2x: HW lock timeout
  bnx2x: Minimize lock time
  bnx2x: Fan failure mechanism on additional design
  bnx2x: Rx work check
  ipv6: sysctl fixes
  ipv4: sysctl fixes
  sctp: add verification checks to SCTP_AUTH_KEY option