Merge branch 'batman-adv/maint' of git://git.open-mesh.org/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Tue, 27 Sep 2011 19:05:47 +0000 (15:05 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 27 Sep 2011 19:05:47 +0000 (15:05 -0400)
commit29453f65a4d0a46190dedf93ab31717d4c26bda6
tree872042a7a8fcf36b72de40140d7552aa03b3ca0a
parenta0babc80eb375aad69dab4687c3b44c47d42f241
parent8b267b312df9343fea3bd679c509b36214b5a854
Merge branch 'batman-adv/maint' of git://git.open-mesh.org/linux-merge