| commit | 1e8d6421cff2c24fe0b345711e7a21af02e8bcf5 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Wed Feb 19 01:24:22 2014 -0500 |
| committer | David S. Miller <davem@davemloft.net> | Wed Feb 19 01:24:22 2014 -0500 |
| tree | 773b30106efb9b48055bc93958e5a94ac53768ce | |
| parent | f7b12606b5de323a2bb5ca1696558efde8f25441 [diff] | |
| parent | 960dfc4eb23a28495276b02604d7458e0e1a1ed8 [diff] |
Merge git://git.kernel.org/pub/scm/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>