From 4468d125cf3e12e3ae530a7d6d89e76bf376f83c Mon Sep 17 00:00:00 2001 From: Joe Perches Date: Tue, 7 Sep 2010 20:33:24 +0000 Subject: [PATCH] --- yaml --- r: 210592 b: refs/heads/master c: 201b6bab6798fcd8ec1cb30165b91fdb89a91775 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/MAINTAINERS | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index d5c959cad507..c98fefef2aa6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 123031c0eeda6144b4002dc3285375aa9ae9dc11 +refs/heads/master: 201b6bab6798fcd8ec1cb30165b91fdb89a91775 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 087912aa09bd..b5fb9bdcabb1 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -1445,6 +1445,16 @@ S: Maintained F: Documentation/video4linux/cafe_ccic F: drivers/media/video/cafe_ccic* +CAIF NETWORK LAYER +M: Sjur Braendeland +L: netdev@vger.kernel.org +S: Supported +F: Documentation/networking/caif/ +F: drivers/net/caif/ +F: include/linux/caif/ +F: include/net/caif/ +F: net/caif/ + CALGARY x86-64 IOMMU M: Muli Ben-Yehuda M: "Jon D. Mason"