| commit | 1af32f0fcf33ddca52c8fd2b5bc84c129dcb1bdd | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Wed Dec 07 15:06:33 2011 -0500 |
| committer | David S. Miller <davem@davemloft.net> | Wed Dec 07 15:06:33 2011 -0500 |
| tree | f749fbe49714be639e4c9579178f9ae0adf4a7de | |
| parent | 28d8ea2d568534026ccda3e8936f5ea1e04a86a1 [diff] | |
| parent | 797399b415b78dacdbcaffdb89e46e369ec88b98 [diff] |
Merge branch 'batman-adv/maint' of git://git.open-mesh.org/linux-merge