git.maquefel.me Git - linux.git/commit

projects / linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: fc8517b 2973633)

author	Herbert Xu <herbert@lithui.me.apana.org.au>
	Fri, 22 Dec 2017 09:00:50 +0000 (20:00 +1100)
committer	Herbert Xu <herbert@lithui.me.apana.org.au>
	Fri, 22 Dec 2017 09:00:50 +0000 (20:00 +1100)
commit	45fa9a324d0f5be9140ba2e0db9b8fb8a0b9b7e8
tree	a5e7c8428030ec0462b58133d6548ddff3802018	tree \| snapshot
parent	fc8517bf627c9b834f80274a1bc9ecd39b27231b	commit \| diff
parent	2973633e9f09311e849f975d969737af81a521ff	commit \| diff

Merge git://git./linux/kernel/git/herbert/crypto-2.6

Merge the crypto tree to pick up inside-secure fixes.

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
crypto/af_alg.c	diff1 \|	diff2 \|	blob \| history
crypto/algif_aead.c	diff1 \|	diff2 \|	blob \| history
crypto/mcryptd.c	diff1 \|	diff2 \|	blob \| history
drivers/crypto/chelsio/Kconfig	diff1 \|	diff2 \|	blob \| history

ep93xx device tree rework repo: git://git.maquefel.me/linux.git