diff options
| author | David S. Miller <davem@davemloft.net> | 2013-02-18 12:22:17 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-02-18 12:22:17 -0500 |
| commit | c8c5b287152bfd10c27390d36df2a8131cf906f5 (patch) | |
| tree | f27dd1d7a78f6ba8424a7a98338a5aba22ebb71f /net/ipv6/reassembly.c | |
| parent | efd9450e7e36717f24dff3bd584faa80a85231d6 (diff) | |
| parent | 97f8b87e9108485a0b7070645662253561304458 (diff) | |
Merge branch 'tipc_net-next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
Paul Gortmaker says:
====================
Two relatively small cleanup patches here, plus a reimplementation
of the patch Neil had questions about[1] in the last development
cycle.
Tested on today's net-next, between 32 and 64 bit x86 machines using
the server/client in tipc-utils, as usual.
[1] http://patchwork.ozlabs.org/patch/204507/
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/reassembly.c')
0 files changed, 0 insertions, 0 deletions