]> git.openfabrics.org - ~shefty/rdma-dev.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 17 Oct 2012 19:41:18 +0000 (12:41 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 17 Oct 2012 19:41:18 +0000 (12:41 -0700)
commit18673533256a2953ccefded52df2679de8640685
treec1dcb3b173cb6032d3f9721e18a11ade346e17f6
parentccbfddb78c7bfdce442589ccce6d60f133251b9d
parent9f0d3c2781baa1102108e16efbe640dd74564a7c
Merge git://git./linux/kernel/git/davem/net

Pull networking fixes from David Miller:

 1) Fix regression in /proc/net/if_inet6, sometimes devices do not get
    listed.  From Eric Dumazet.

 2) Add IPSEC networking sub-section to MAINTAINERS.

 3) S390 networking fixes from Hendrik Brueckner and Stefan Raspl.

 4) Fix enslavement of devices that can't do VLAN properly, from Jiri
    Pirko.

 5) SCTP sack handling fix from Zijie Pan.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
  ipv6: addrconf: fix /proc/net/if_inet6
  bnx2x: fix handling mf storage modes
  qeth: fix deadlock between recovery and bonding driver
  smsgiucv: reestablish IUCV path after resume
  sctp: fix call to SCTP_CMD_PROCESS_SACK in sctp_cmd_interpreter()
  vlan: fix bond/team enslave of vlan challenged slave/port
  MAINTAINERS: Add explicit section for IPSEC networking.
MAINTAINERS