---

yaml
---
r: 39394
b: refs/heads/master
c: 489b10c
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f061c5847bcc72eebf6a783f458d42092eac1b6a
+refs/heads/master: 489b10c1f63fafcb89c330a0603694652068132a

trunk/Documentation/filesystems/00-INDEX

@@ -34,8 +34,6 @@ ext2.txt
 	- info, mount options and specifications for the Ext2 filesystem.
 ext3.txt
 	- info, mount options and specifications for the Ext3 filesystem.
-ext4.txt
-	- info, mount options and specifications for the Ext4 filesystem.
 files.txt
 	- info on file management in the Linux kernel.
 fuse.txt

trunk/Documentation/lockdep-design.txt

@@ -50,10 +50,10 @@ The bit position indicates hardirq, softirq, hardirq-read,
 softirq-read respectively, and the character displayed in each
 indicates:
 
-   '.'  acquired while irqs disabled
+   '.'	 acquired while irqs enabled
    '+'  acquired in irq context
-   '-'  acquired with irqs enabled
-   '?' read acquired in irq context with irqs enabled.
+   '-'  acquired in process context with irqs disabled
+   '?'  read-acquired both with irqs enabled and in irq context
 
 Unused mutexes cannot be part of the cause of an error.
 

trunk/Documentation/sysctl/kernel.txt

@@ -86,7 +86,7 @@ valid for 30 seconds.
 core_pattern:
 
 core_pattern is used to specify a core dumpfile pattern name.
-. max length 128 characters; default value is "core"
+. max length 64 characters; default value is "core"
 . core_pattern is used as a pattern template for the output filename;
   certain string patterns (beginning with '%') are substituted with
   their actual values.
@@ -105,9 +105,6 @@ core_pattern is used to specify a core dumpfile pattern name.
 	%h	hostname
 	%e	executable filename
 	%<OTHER> both are dropped
-. If the first character of the pattern is a '|', the kernel will treat
-  the rest of the pattern as a command to run.  The core dump will be
-  written to the standard input of that program instead of to a file.
 
 ==============================================================
 

trunk/MAINTAINERS

@@ -641,7 +641,7 @@ CALGARY x86-64 IOMMU
 P:	Muli Ben-Yehuda
 M:	muli@il.ibm.com
 P:	Jon D. Mason
-M:	jdmason@kudzu.us
+M:	jdmason@us.ibm.com
 L:	linux-kernel@vger.kernel.org
 L:	discuss@x86-64.org
 S:	Maintained
@@ -2261,17 +2261,6 @@ T:	git kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6.git
 T:	cvs cvs.parisc-linux.org:/var/cvs/linux-2.6
 S:	Maintained
 
-PC87360 HARDWARE MONITORING DRIVER
-P:	Jim Cromie
-M:	jim.cromie@gmail.com
-L:	lm-sensors@lm-sensors.org
-S:	Maintained
-
-PC8736x GPIO DRIVER
-P:	Jim Cromie
-M:	jim.cromie@gmail.com
-S:	Maintained
-
 PCI ERROR RECOVERY
 P:	Linas Vepstas
 M:	linas@austin.ibm.com
@@ -2603,19 +2592,10 @@ L: lksctp-developers@lists.sourceforge.net
 S: Supported
 
 SCx200 CPU SUPPORT
-P:	Jim Cromie
-M:	jim.cromie@gmail.com
-S:	Odd Fixes
-
-SCx200 GPIO DRIVER
-P:	Jim Cromie
-M:	jim.cromie@gmail.com
-S:	Maintained
-
-SCx200 HRT CLOCKSOURCE DRIVER
-P:	Jim Cromie
-M:	jim.cromie@gmail.com
-S:	Maintained
+P:	Christer Weinigel
+M:	christer@weinigel.se
+W:	http://www.weinigel.se
+S:	Supported
 
 SECURITY CONTACT
 P:	Security Officers
@@ -2780,7 +2760,14 @@ S:	Maintained
 UltraSPARC (sparc64):
 P:	David S. Miller
 M:	davem@davemloft.net
+P:	Eddie C. Dost
+M:	ecd@brainaid.de
+P:	Jakub Jelinek
+M:	jj@sunsite.ms.mff.cuni.cz
+P:	Anton Blanchard
+M:	anton@samba.org
 L:	sparclinux@vger.kernel.org
+L:	ultralinux@vger.kernel.org
 T:	git kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6.git
 S:	Maintained
 

trunk/Makefile

@@ -741,9 +741,6 @@ endif # ifdef CONFIG_KALLSYMS
 
 # vmlinux image - including updated kernel symbols
 vmlinux: $(vmlinux-lds) $(vmlinux-init) $(vmlinux-main) $(kallsyms.o) FORCE
-ifdef CONFIG_HEADERS_CHECK
-	$(Q)$(MAKE) headers_check
-endif
 	$(call if_changed_rule,vmlinux__)
 	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost $@
 	$(Q)rm -f .old_version