| commit | 9eeebb5bc8d984298cba9d12690923cdc09ab173 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Sun Oct 30 03:05:07 2011 -0400 |
| committer | David S. Miller <davem@davemloft.net> | Sun Oct 30 03:05:07 2011 -0400 |
| tree | 2917993c44af42e335533b1018b35c17b3747132 | |
| parent | 3ddb709af32bacaf78d124420404d1ac19be99b8 [diff] | |
| parent | 93840ac40bb0d0f177ef8af74e64671be67e8c37 [diff] |
Merge branch 'batman-adv/maint' of git://git.open-mesh.org/linux-merge