diff options
| author | David S. Miller <davem@davemloft.net> | 2012-11-30 12:22:04 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-11-30 12:22:04 -0500 |
| commit | dad52fd964c54aa275ebb5c935ef8d8b0eded74d (patch) | |
| tree | 2695ef8cdaf558e717574d9d61ccae14091b62d2 /include/net | |
| parent | sctp: fix CONFIG_SCTP_DBG_MSG=y null pointer dereference in sctp_v6_get_dst() (diff) | |
| parent | batman-adv: use ETH_P_BATMAN (diff) | |
| download | linux-dad52fd964c54aa275ebb5c935ef8d8b0eded74d.tar.gz linux-dad52fd964c54aa275ebb5c935ef8d8b0eded74d.zip | |
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>
Diffstat (limited to 'include/net')
0 files changed, 0 insertions, 0 deletions