Merge branch 'batman-adv/merge' of git://git.open-mesh.org/ecsv/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Tue, 8 Feb 2011 03:54:14 +0000 (19:54 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 8 Feb 2011 03:54:14 +0000 (19:54 -0800)
commit429a01a70f301baf0c8fc780f891a18c296d5e24
tree663ee8a8c0a47d364648d5f905f185e875e48d62
parent95c3043008ca8449feb96aba5481fe31c2ea750b
parent531c9da8c854c5b075383253a57fdd4e0be82e99
Merge branch 'batman-adv/merge' of git://git.open-mesh.org/ecsv/linux-merge