summaryrefslogtreecommitdiffstats
path: root/net/bridge
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-01-30 22:16:34 -0800
committerDavid S. Miller <davem@davemloft.net>2011-01-30 22:16:34 -0800
commit81c2bdb68855b29a4339313a6f0d07791b663ce7 (patch)
treeb8eac6dd767ab805989fb8a935adf3d7ebca995e /net/bridge
parent709b46e8d90badda1898caea50483c12af178e96 (diff)
parent1181e1daace88018b2ff66592aa10a4791d705ff (diff)
Merge branch 'batman-adv/merge-oopsonly' of git://git.open-mesh.org/ecsv/linux-merge
Diffstat (limited to 'net/bridge')
0 files changed, 0 insertions, 0 deletions