---

yaml --- r: 210592 b: refs/heads/master c: 201b6ba h: refs/heads/master v: v3
git-mirror · Sep 10, 2010 · 4468d12 · 4468d12
1 parent b8f99db
commit 4468d12
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 123031c0eeda6144b4002dc3285375aa9ae9dc11
+refs/heads/master: 201b6bab6798fcd8ec1cb30165b91fdb89a91775
diff --git 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 <sjur.brandeland@stericsson.com>
+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 <muli@il.ibm.com>
 M:	"Jon D. Mason" <jdmason@kudzu.us>