| commit | 3f9aed7c7d517dbc717a97649d0a5a9dc80bf4f2 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Fri Jul 08 08:44:57 2011 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Fri Jul 08 08:44:57 2011 -0700 |
| tree | bed215245dc32aea477c76f7124e6af13ba362ac | |
| parent | 31817df025e24559a01d33ddd68bd11b21bf9d7b [diff] | |
| parent | a7f9becb7d27008af0f72f8449c110276b0df37d [diff] |
Merge branch 'batman-adv/next' of git://git.open-mesh.org/linux-merge