]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorHerbert Xu <herbert@gondor.apana.org.au>
Tue, 22 Aug 2017 06:53:32 +0000 (14:53 +0800)
committerHerbert Xu <herbert@gondor.apana.org.au>
Tue, 22 Aug 2017 06:53:32 +0000 (14:53 +0800)
commit7158d6446396a3915a6a3a3dc4ca410dd3e9f459
treec023a7a8fa0255f03040c63a73068eaaca03f1af
parent6ef390c856b858231a5e06c113ee1828eadb346e
parentce9e934dbe37bac308422f31aa84b6cd86cbfd7a
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Merge the crypto tree to resolve the conflict between the temporary
and long-term fixes in algif_skcipher.