8ca699ceaabaf5fecdbda787
parent 71cc7c37af71b497698f7f8a68e46a458071fcef
parent ea3d2fd1b11fb3ef8706a48ece0a49a61bcd08bc
author David S. Miller <davem@davemloft.net> 1329511752 -0500
committer David S. Miller <davem@davemloft.net> 1329511752 -0500

Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge