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)
commitbf693f7beb35b6d001bd887e5b02163335f3bd9a
tree006edfbf6562e359b1f1ff1ed6ea5c3805f76e17
parent6e9e16e6143b725662e47026a1d0f270721cdd24
parentf855691975bb06373a98711e4cfe2c224244b536
Merge branch 'master' of git://git./linux/kernel/git/klassert/ipsec

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>