From: David S. Miller <davem@davemloft.net>
Date: Wed, 19 Feb 2014 06:24:22 +0000 (-0500)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: v3.15-rc1~113^2~303
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e8d6421cff2c24fe0b345711e7a21af02e8bcf5;p=pandora-kernel.git

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

Conflicts:
	drivers/net/bonding/bond_3ad.h
	drivers/net/bonding/bond_main.c

Two minor conflicts in bonding, both of which were overlapping
changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

1e8d6421cff2c24fe0b345711e7a21af02e8bcf5
Reading git-diff-tree failed