diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-07-21 13:48:09 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-07-21 13:48:09 +1000 |
| commit | 9128648d88504d29f0e494fbade8aae0ae6c36c4 (patch) | |
| tree | 43f7cc1f113ca75dda9d857bf0a1597710b67944 /MAINTAINERS | |
| parent | f3e75597032258266849104afd39cfbf138d6aed (diff) | |
| parent | 96956aef2ff5521af44d6cb896c967d025360ead (diff) | |
Merge remote-tracking branch 'crypto/master'
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index d2600fd39145..47d3a9c8d277 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7241,6 +7241,12 @@ M: Robert Jarzmik <robert.jarzmik@free.fr> L: rtc-linux@googlegroups.com S: Maintained +QAT DRIVER +M: Tadeusz Struk <tadeusz.struk@intel.com> +L: qat-linux@intel.com +S: Supported +F: drivers/crypto/qat/ + QIB DRIVER M: Mike Marciniszyn <infinipath@intel.com> L: linux-rdma@vger.kernel.org |