tree 233bbcd4b0704d36ebbc94fbbbc0698f0434a8ae
parent eea41aee2bfad4cf5c84e1cab8aa068c66206651
parent 8aa51d64c1f526e43b1e7f89fb8b98c2fd583f4b
author Linus Torvalds <torvalds@linux-foundation.org> 1337019572 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1337019572 -0700

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Pull networking fixes from David Miller:
 "The main purpose of this pull request is to fix up the erroneous
  bonding patch I applied last round.  I meant to apply v4 of the patch
  from Jiri but I applied v3 by accident.  Mea culpa.

  Also, eagle eyed Dan Carpenter noticed that openvswitch has one of
  those "X = alloc(); if (!Y)" mistakes, test the proper pointer
  instead."

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
  openvswitch: checking wrong variable in queue_userspace_packet()
  bonding: Fix LACPDU rx_dropped commit.