---

yaml --- r: 160981 b: refs/heads/master c: 99f329a h: refs/heads/master i: 160979: 9f7bb65 v: v3
git-mirror · Sep 7, 2009 · 9a1f594 · 9a1f594
1 parent f8fa999
commit 9a1f594
Show file tree

Hide file tree

Showing 178 changed files with 1,451 additions and 2,116 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 56ddf7e6d4f69d7ce9f1c484b62e99d6b029e6f8
+refs/heads/master: 99f329a2ba3c2d07cc90ca9309babf27ddf98bff
diff --git a/trunk/Documentation/filesystems/9p.txt b/trunk/Documentation/filesystems/9p.txt
@@ -123,9 +123,6 @@ available from the same CVS repository.
 There are user and developer mailing lists available through the v9fs project
 on sourceforge (http://sourceforge.net/projects/v9fs).
 
-A stand-alone version of the module (which should build for any 2.6 kernel)
-is available via (http://github.com/ericvh/9p-sac/tree/master)
-
 News and other information is maintained on SWiK (http://swik.net/v9fs).
 
 Bug reports may be issued through the kernel.org bugzilla 

diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
@@ -2239,7 +2239,8 @@ S:	Maintained
 F:	drivers/media/video/gspca/pac207.c
 
 GSPCA SN9C20X SUBDRIVER
-M:	Brian Johnson <brijohn@gmail.com>
+P:	Brian Johnson
+M:	brijohn@gmail.com
 L:	linux-media@vger.kernel.org
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 S:	Maintained

diff --git a/trunk/Makefile b/trunk/Makefile
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 31
-EXTRAVERSION = -rc8
+EXTRAVERSION = -rc7
 NAME = Man-Eating Seals of Antiquity
 
 # *DOCUMENTATION*