| commit | c7c6575f254e5621a8408c29bdab0d704c3fab6e | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Mon Dec 12 19:26:07 2011 -0500 |
| committer | David S. Miller <davem@davemloft.net> | Mon Dec 12 19:26:07 2011 -0500 |
| tree | d0b399a480a8633be6373c035f6253e1a40987af | |
| parent | 0850f0f5c54261a6236f013e8bac154bcce424d6 [diff] | |
| parent | b5a1eeef04cc7859f34dec9b72ea1b28e4aba07c [diff] |
Merge branch 'batman-adv/next' of git://git.open-mesh.org/linux-merge