---

yaml
---
r: 41025
b: refs/heads/master
c: 37b1bcc
h: refs/heads/master
i:
  41023: 903f660
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e5ffd2bb62c3f2c0d9f34e0d16fab6e2c8b056fb
+refs/heads/master: 37b1bccfe75691f5f42bf210d8a349f931896887

trunk/.gitignore

@@ -20,7 +20,6 @@
 # Top-level generic files
 #
 tags
-TAGS
 vmlinux*
 System.map
 Module.symvers

trunk/CREDITS

@@ -45,7 +45,7 @@ S: Longford, Ireland
 S: Sydney, Australia
 
 N: Tigran A. Aivazian
-E: tigran@aivazian.fsnet.co.uk
+E: tigran@veritas.com
 W: http://www.moses.uklinux.net/patches
 D: BFS filesystem
 D: Intel IA32 CPU microcode update support
@@ -3511,12 +3511,14 @@ D: The Linux Support Team Erlangen
 
 N: David Weinehall
 E: tao@acc.umu.se
-P: 1024D/DC47CA16 7ACE 0FB0 7A74 F994 9B36  E1D1 D14E 8526 DC47 CA16
 W: http://www.acc.umu.se/~tao/
-D: v2.0 kernel maintainer
+W: http://www.acc.umu.se/~mcalinux/
 D: Fixes for the NE/2-driver
 D: Miscellaneous MCA-support
 D: Cleanup of the Config-files
+S: Axtorpsvagen 40:20
+S: S-903 37  UMEA
+S: Sweden
 
 N: Matt Welsh
 E: mdw@metalab.unc.edu

trunk/Documentation/ABI/testing/sysfs-power

@@ -21,7 +21,7 @@ Description:
 		these states.
 
 What:		/sys/power/disk
-Date:		September 2006
+Date:		August 2006
 Contact:	Rafael J. Wysocki <rjw@sisk.pl>
 Description:
 		The /sys/power/disk file controls the operating mode of the
@@ -39,28 +39,13 @@ Description:
 		'reboot' - the memory image will be saved by the kernel and
 		the system will be rebooted.
 
-		Additionally, /sys/power/disk can be used to turn on one of the
-		two testing modes of the suspend-to-disk mechanism: 'testproc'
-		or 'test'.  If the suspend-to-disk mechanism is in the
-		'testproc' mode, writing 'disk' to /sys/power/state will cause
-		the kernel to disable nonboot CPUs and freeze tasks, wait for 5
-		seconds, unfreeze tasks and enable nonboot CPUs.  If it is in
-		the 'test' mode, writing 'disk' to /sys/power/state will cause
-		the kernel to disable nonboot CPUs and freeze tasks, shrink
-		memory, suspend devices, wait for 5 seconds, resume devices,
-		unfreeze tasks and enable nonboot CPUs.  Then, we are able to
-		look in the log messages and work out, for example, which code
-		is being slow and which device drivers are misbehaving.
-
 		The suspend-to-disk method may be chosen by writing to this
 		file one of the accepted strings:
 
 		'firmware'
 		'platform'
 		'shutdown'
 		'reboot'
-		'testproc'
-		'test'
 
 		It will only change to 'firmware' or 'platform' if the system
 		supports that.

trunk/Documentation/DocBook/Makefile

@@ -9,7 +9,7 @@
 DOCBOOKS := wanbook.xml z8530book.xml mcabook.xml videobook.xml \
 	    kernel-hacking.xml kernel-locking.xml deviceiobook.xml \
 	    procfs-guide.xml writing_usb_driver.xml \
-	    kernel-api.xml filesystems.xml lsm.xml usb.xml \
+	    kernel-api.xml journal-api.xml lsm.xml usb.xml \
 	    gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \
 	    genericirq.xml