Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec
authorDavid S. Miller <davem@davemloft.net>
Tue, 27 Jan 2015 08:28:38 +0000 (00:28 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 27 Jan 2015 08:28:38 +0000 (00:28 -0800)
Steffen Klassert says:

====================
ipsec 2015-01-26

Just two small fixes for _decode_session6() where we
might decode to wrong header information in some rare
situations.

Please pull or let me know if there are problems.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

Trivial merge