summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2013-03-28 14:34:23 -0400
committerDavid S. Miller <davem@davemloft.net>2013-03-28 14:34:23 -0400
commitea407f0b97ad6a1fed8e72121bd19d66f02524f6 (patch)
tree51a0ff3f3dbb7228150380aca2795e3eeb06b5bf /drivers/net
parent9631d79e815197dbe90080aedfbab6de41218d85 (diff)
parent0c81465357ffe29da9ff20103afe4a59908e0d30 (diff)
Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
Included changes: - A fix for the network coding component which has been added within the last pull request (so it is in linux-3.10). The problem has been spotted thanks to Fengguang Wu's automated daily checks on our tree. - Implementation of the RTNL API for virtual interface creation/deletion and slave manipulation - substitution of seq_printf with seq_puts when possible - minor cleanups Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
0 files changed, 0 insertions, 0 deletions