]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Tue, 19 Jun 2012 03:23:55 +0000 (20:23 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 19 Jun 2012 03:23:55 +0000 (20:23 -0700)
Included changes:

* major skb->data pointer usage fix
* interval version update
* added get_ethtool_stats() support
* endianess clean up
* routing protocol API improvement wrt TT commit code
* fix locking in hash table code
* minor cleanups and fixes


Trivial merge