The following commit has been merged in the master branch: commit f8bae99ee5030625a4e7f0d87784191882292f0e Merge: 994635a137f637466d36a7c6272dae014a46a11c 44c4349a2a117b22a5c4087f2ac9faf10c575e17 Author: David S. Miller davem@davemloft.net Date: Tue Jul 5 19:45:12 2011 -0700

Merge branch 'batman-adv/next' of git://git.open-mesh.org/linux-merge