| commit | dad52fd964c54aa275ebb5c935ef8d8b0eded74d | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Fri Nov 30 12:22:04 2012 -0500 |
| committer | David S. Miller <davem@davemloft.net> | Fri Nov 30 12:22:04 2012 -0500 |
| tree | 2695ef8cdaf558e717574d9d61ccae14091b62d2 | |
| parent | ee3f34e857238a4552c68d860348893d7728bcab [diff] | |
| parent | af5d4f7737963f2112f148f97c5820425f050650 [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>