The following commit has been merged in the master branch: commit 3f9aed7c7d517dbc717a97649d0a5a9dc80bf4f2 Merge: 31817df025e24559a01d33ddd68bd11b21bf9d7b a7f9becb7d27008af0f72f8449c110276b0df37d Author: David S. Miller davem@davemloft.net Date: Fri Jul 8 08:44:57 2011 -0700

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