| commit | 29453f65a4d0a46190dedf93ab31717d4c26bda6 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Tue Sep 27 15:05:47 2011 -0400 |
| committer | David S. Miller <davem@davemloft.net> | Tue Sep 27 15:05:47 2011 -0400 |
| tree | 872042a7a8fcf36b72de40140d7552aa03b3ca0a | |
| parent | a0babc80eb375aad69dab4687c3b44c47d42f241 [diff] | |
| parent | 8b267b312df9343fea3bd679c509b36214b5a854 [diff] |
Merge branch 'batman-adv/maint' of git://git.open-mesh.org/linux-merge