summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2015-02-24 16:05:54 -0500
committerDavid S. Miller <davem@davemloft.net>2015-02-24 16:05:54 -0500
commit8ff3ac060fb6b56aefa9ab6e815805addc4aa867 (patch)
tree22a0420c1ffd7ed7f996f1dedd675da7644a1d9b /net
parent2a12d6cf751ff4a26f4054670d4f19ff315ed3b0 (diff)
parent14c9551a32eba086c9f20c9d6a8e378481f15333 (diff)
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>
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions