commit | 0e43182c0c9482a26a4108da9254f3e2869a8e18 | [log] [tgz] |
---|---|---|
author | David S. Miller <davem@davemloft.net> | Wed Aug 24 10:33:00 2011 -0700 |
committer | David S. Miller <davem@davemloft.net> | Wed Aug 24 10:33:00 2011 -0700 |
tree | 4631b42bebca8dd9bca61e167e543aabd3b981a7 | |
parent | 131ea6675c761f655d43b808dd0fe83d15d5cdd3 [diff] | |
parent | a943cac144e035c21d4f1b31b95f15b33c33a480 [diff] |
Merge branch 'batman-adv/next' of git://git.open-mesh.org/linux-merge