---

yaml --- r: 132233 b: refs/heads/master c: 649426e h: refs/heads/master i: 132231: 3980562 v: v3
git-mirror · Mar 12, 2009 · 9143795 · 9143795
1 parent e7d8c20
commit 9143795
Show file tree

Hide file tree

Showing 55 changed files with 377 additions and 780 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c12e56ef6951f4fce1afe9ef6aab9243ea9a9b04
+refs/heads/master: 649426efcfbc67a8b033497151816cbac9fd0cfa
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
@@ -1469,6 +1469,8 @@ L:	linux-acpi@vger.kernel.org
 S:	Supported
 
 DOCUMENTATION (/Documentation directory)
+P:	Michael Kerrisk
+M:	mtk.manpages@gmail.com
 P:	Randy Dunlap
 M:	rdunlap@xenotime.net
 L:	linux-doc@vger.kernel.org
@@ -2877,7 +2879,7 @@ P:	Michael Kerrisk
 M:	mtk.manpages@gmail.com
 W:	http://www.kernel.org/doc/man-pages
 L:	linux-man@vger.kernel.org
-S:	Maintained
+S:	Supported
 
 MARVELL LIBERTAS WIRELESS DRIVER
 P:	Dan Williams

diff --git a/trunk/arch/mips/configs/ip27_defconfig b/trunk/arch/mips/configs/ip27_defconfig
@@ -512,7 +512,7 @@ CONFIG_MD_LINEAR=m
 CONFIG_MD_RAID0=y
 CONFIG_MD_RAID1=y
 CONFIG_MD_RAID10=m
-CONFIG_MD_RAID456=y
+CONFIG_MD_RAID456=m
 CONFIG_MD_RAID5_RESHAPE=y
 CONFIG_MD_MULTIPATH=m
 CONFIG_MD_FAULTY=m