diff options
| author | David S. Miller <davem@davemloft.net> | 2011-07-28 18:38:53 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-07-28 18:38:53 -0700 |
| commit | 384b90abeba71579e0601ff434e3ea40c15057f0 (patch) | |
| tree | 40ffc4aa392457e27d6ae9304fa4216db2611f05 /net/batman-adv | |
| parent | 9e8f90dfe58eb19140bc66655170c7aef9eadbf2 (diff) | |
| parent | 7676e345824f162191b1fe2058ad948a6cf91c20 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-2.6
Diffstat (limited to 'net/batman-adv')
0 files changed, 0 insertions, 0 deletions