diff options
author | David S. Miller <davem@davemloft.net> | 2012-07-02 04:56:33 +0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-07-02 04:56:33 +0400 |
commit | e87183c2b5ab1f55ebad2f260a7eb4d31549ce25 (patch) | |
tree | 85346674b2ff741ec9053470736ba2d034156190 /net/ipv4/ip_options.c | |
parent | a59a4d1921664da63d801ba477950114c71c88c9 (diff) | |
parent | 162d549c6905485262635fe594db337efb2828b5 (diff) | |
download | linux-e87183c2b5ab1f55ebad2f260a7eb4d31549ce25.tar.xz |
Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
Included changes:
- The last batch of patches aimed to clean the batman-adv namespace
- a couple of style fixes
- a fix for the ethtool support
- a fix to prevent sending unicast packets with an uninitialised header
field
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ip_options.c')
0 files changed, 0 insertions, 0 deletions