Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Wed, 1 Jun 2011 03:34:19 +0000 (20:34 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 1 Jun 2011 03:34:19 +0000 (20:34 -0700)
commit5bf74c91d7bf56be47c215e6a314ba42da0b68ad
treead402c84f05ac519b96b7696f60d4730650725b3
parente11ec900cfbea3d8f6a188674ee6fcb65f2a73d6
parentbb899b89f46eb1fd6f62a4c360f6511b9714e479
Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-merge