diff options
| author | David S. Miller <davem@davemloft.net> | 2012-04-18 13:21:59 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-04-18 13:21:59 -0400 |
| commit | 91fbe33034c184c6a60e31c2207a2f7ec2f180dc (patch) | |
| tree | 9b921989b33854d15ad1610a795d28b20810b21d /net/nfc/nfc.h | |
| parent | 798ec84d45754403571d6387396236e877965c5a (diff) | |
| parent | 1e5cc266dbc401d11aefb966ad35e651c2f67414 (diff) | |
Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
Included changes:
* remove duplicated line in comment
* add htons() invocation for tt_crc as suggested by Al Viro
* OriGinator Message seqno initial value is now random
* some cleanups and fixes
Diffstat (limited to 'net/nfc/nfc.h')
0 files changed, 0 insertions, 0 deletions