Merge branch 'bonding-next'
authorDavid S. Miller <davem@davemloft.net>
Tue, 24 Feb 2015 21:05:54 +0000 (16:05 -0500)
committerDavid S. Miller <davem@davemloft.net>
Tue, 24 Feb 2015 21:05:54 +0000 (16:05 -0500)
commit8ff3ac060fb6b56aefa9ab6e815805addc4aa867
tree22a0420c1ffd7ed7f996f1dedd675da7644a1d9b
parent2a12d6cf751ff4a26f4054670d4f19ff315ed3b0
parent14c9551a32eba086c9f20c9d6a8e378481f15333
Merge branch 'bonding-next'

Mahesh Bandewar says:

====================
(Shortened) Bonding patch series

I'm shortening the earlier patch series to just two patches at this moment.
Andy is going to integrate remaining 3 patches with his netlink changes
and post the completed patches.

These two patches are the same one from the previous patch series with
some styling changes (Dave Miller's suggestions) for the churn-machine patch.
====================

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