tree 08c4399e0341f7eb0ccb24e15f2cab687275c2a4
parent 8083f0fc969d9b5353061a7a6f963405057e26b1
parent 3ee72ca99288f1de95ec9c570e43f531c8799f06
author David S. Miller <davem@davemloft.net> 1318009123 -0400
committer David S. Miller <davem@davemloft.net> 1318009123 -0400

Merge branch 'master' of github.com:davem330/net

Conflicts:
	net/batman-adv/soft-interface.c