]> Pileus Git - ~andy/linux/commitdiff
projects / ~andy / linux / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 313b037 2d3f6cc)
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)
Included changes:
- fix a bug generated by the wrong interaction between the GW feature and the
  Bridge Loop Avoidance


Trivial merge
Andy's Linux Kernel repo