Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/shemminger...
authorDavid S. Miller <davem@davemloft.net>
Tue, 2 Jul 2013 06:17:19 +0000 (23:17 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 2 Jul 2013 06:17:19 +0000 (23:17 -0700)
commit936faf6c4937c50048e5779f6e49cfce566048d3
treecbf817cd3d7e44498aa561354821d072f755728d
parentb1a5a34bd0b8767ea689e68f8ea513e9710b671e
parentba609e9bf15bd7df35e2c06a2e5aaf9ab9289b10
Merge branch 'master' of git://git./linux/kernel/git/shemminger/vxlan-next

Stephen Hemminger says:

====================
Here is current updates for vxlan in net-next.  It includes Mike's changes
to handle multiple destinations and lots of little cosmetic stuff.

This is a fresh vxlan-next repository which was forked from net-next.
====================

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