summaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2017-02-17 10:57:37 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2017-02-17 10:57:37 +1100
commitad7b78d2e5105e46c577ab24aa7d565bfdaaa611 (patch)
tree9060e6caf6fe6dfceafbed79be04a62a43f67b2b /MAINTAINERS
parentd7e5960db95570fdb5d4c7053e8c6c4a8a09f285 (diff)
parentdcd36c436c9c1c5052be6bc2a9200e4e6dfbd267 (diff)
Merge remote-tracking branch 'crypto/master'
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS7
1 files changed, 7 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 18aec60d65dd..4fad3254f7b6 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3035,6 +3035,13 @@ W: http://www.cavium.com
S: Supported
F: drivers/net/ethernet/cavium/liquidio/
+CAVIUM OCTEON-TX CRYPTO DRIVER
+M: George Cherian <george.cherian@cavium.com>
+L: linux-crypto@vger.kernel.org
+W: http://www.cavium.com
+S: Supported
+F: drivers/crypto/cavium/cpt/
+
CC2520 IEEE-802.15.4 RADIO DRIVER
M: Varka Bhadram <varkabhadram@gmail.com>
L: linux-wpan@vger.kernel.org