]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge tag 'batman-adv-fix-for-davem' of git://git.open-mesh.org/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Wed, 11 Jul 2012 06:31:37 +0000 (23:31 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 11 Jul 2012 06:31:37 +0000 (23:31 -0700)
commit941a46a29c9388f9cef518fa3498329fb55badca
tree548156dac0a7f8246310d5beb4cda3ecff14e67e
parent313b037cf054ec908de92fb4c085403ffd7420d4
parent2d3f6ccc4ea5c74d4b4af1b47c56b4cff4bbfcb7
Merge tag 'batman-adv-fix-for-davem' of git://git.open-mesh.org/linux-merge

Included changes:
- fix a bug generated by the wrong interaction between the GW feature and the
  Bridge Loop Avoidance