Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Mon, 2 Jul 2012 00:56:33 +0000 (17:56 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 2 Jul 2012 00:56:33 +0000 (17:56 -0700)
Included changes:
- The last batch of patches aimed to clean the batman-adv namespace
- a couple of style fixes
- a fix for the ethtool support
- a fix to prevent sending unicast packets with an uninitialised header
  field

Signed-off-by: David S. Miller <davem@davemloft.net>

Trivial merge