Merge branch 'chapoly'
authorMartin Willi <martin@revosec.ch>
Sun, 12 Jul 2015 11:55:08 +0000 (13:55 +0200)
committerMartin Willi <martin@revosec.ch>
Sun, 12 Jul 2015 11:55:08 +0000 (13:55 +0200)
Add ChaCha20/Poly1305 AEAD support in IKEv2 and libipsec ESP through the
chapoly plugin, and in kernel ESP SAs starting with Linux 4.2.


Trivial merge