crypto: fix mis-merge with the networking merge
[cascardo/linux.git] / crypto / algif_aead.c
2015-04-15 Linus Torvaldscrypto: fix mis-merge with the networking merge
2015-04-15 Linus TorvaldsMerge branch 'exec_domain_rip_v2' of git://git./linux...
2015-04-15 Linus TorvaldsMerge tag 'for-linus-4.1' of git://git./linux/kernel...
2015-04-15 Linus TorvaldsMerge tag 'upstream-4.1-rc1' of git://git.infradead...
2015-04-15 Linus TorvaldsMerge branch 'for-linus-2' of git://git./linux/kernel...
2015-04-15 Linus TorvaldsMerge branch 'kconfig' of git://git./linux/kernel/git...
2015-04-15 Linus TorvaldsMerge branch 'kbuild' of git://git./linux/kernel/git...
2015-04-15 Linus TorvaldsMerge branch 'next' of git://git./linux/kernel/git...
2015-04-15 Linus TorvaldsMerge git://git./linux/kernel/git/herbert/crypto-2.6
2015-03-04 Stephan Muellercrypto: algif - add AEAD support