projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ee3f34e af5d4f7)
Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Fri, 30 Nov 2012 17:22:04 +0000 (12:22 -0500)
committerDavid S. Miller <davem@davemloft.net>
Fri, 30 Nov 2012 17:22:04 +0000 (12:22 -0500)
commitdad52fd964c54aa275ebb5c935ef8d8b0eded74d
tree2695ef8cdaf558e717574d9d61ccae14091b62d2tree | snapshot
parentee3f34e857238a4552c68d860348893d7728bcabcommit | diff
parentaf5d4f7737963f2112f148f97c5820425f050650commit | diff
Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge

Included changes:
- Use the new ETH_P_BATMAN define instead of the private BATADV_ETH_P_BATMAN

Signed-off-by: David S. Miller <davem@davemloft.net>
John Crispins staging tree