diff --git a/[refs] b/[refs] index dd7e78bc7ef1..7d1bddce6f30 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e763eb699be723fb41af818118068c6b3afdaf8d +refs/heads/master: 956c203c5e370c7beb766400b5c1a32ec570ce96 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index f2dfb204c8e9..a43769e45c4e 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -3415,6 +3415,12 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git S: Maintained F: arch/ia64/ +IBM Power in-Nest Crypto Acceleration +M: Kent Yoder +L: linux-crypto@vger.kernel.org +S: Supported +F: drivers/crypto/nx/ + IBM Power 842 compression accelerator M: Robert Jennings S: Supported