---

yaml --- r: 156077 b: refs/heads/master c: ec79be2 h: refs/heads/master i: 156075: dd249e4 v: v3
git-mirror · Jul 29, 2009 · e4adda6 · e4adda6
1 parent f7afd0c
commit e4adda6
Show file tree

Hide file tree

Showing 129 changed files with 6,441 additions and 6,263 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 084bad91afd0f40ff4db9ceb56e29234c314d8d1
+refs/heads/master: ec79be26875f6c1468784876cb99192b7f41c7a5
diff --git a/trunk/CREDITS b/trunk/CREDITS
@@ -2006,9 +2006,6 @@ E: paul@laufernet.com
 D: Soundblaster driver fixes, ISAPnP quirk
 S: California, USA
 
-N: Jonathan Layes
-D: ARPD support
-
 N: Tom Lees
 E: tom@lpsg.demon.co.uk
 W: http://www.lpsg.demon.co.uk/
@@ -3805,9 +3802,6 @@ S: van Bronckhorststraat 12
 S: 2612 XV Delft
 S: The Netherlands
 
-N: Thomas Woller
-D: CS461x Cirrus Logic sound driver
-
 N: David Woodhouse
 E: dwmw2@infradead.org
 D: JFFS2 file system, Memory Technology Device subsystem,

diff --git a/trunk/Documentation/filesystems/sysfs.txt b/trunk/Documentation/filesystems/sysfs.txt
@@ -23,8 +23,7 @@ interface.
 Using sysfs
 ~~~~~~~~~~~
 
-sysfs is always compiled in if CONFIG_SYSFS is defined. You can access
-it by doing:
+sysfs is always compiled in. You can access it by doing:
 
     mount -t sysfs sysfs /sys 
 

diff --git a/trunk/Documentation/sysrq.txt b/trunk/Documentation/sysrq.txt
@@ -66,8 +66,7 @@ On all -  write a character to /proc/sysrq-trigger.  e.g.:
 'b'     - Will immediately reboot the system without syncing or unmounting
           your disks.
 
-'c'	- Will perform a system crash by a NULL pointer dereference.
-          A crashdump will be taken if configured.
+'c'	- Will perform a kexec reboot in order to take a crashdump.
 
 'd'	- Shows all locks that are held.
 
@@ -142,8 +141,8 @@ useful when you want to exit a program that will not let you switch consoles.
 re'B'oot is good when you're unable to shut down. But you should also 'S'ync
 and 'U'mount first.
 
-'C'rash can be used to manually trigger a crashdump when the system is hung.
-Note that this just triggers a crash if there is no dump mechanism available.
+'C'rashdump can be used to manually trigger a crashdump when the system is hung.
+The kernel needs to have been built with CONFIG_KEXEC enabled.
 
 'S'ync is great when your system is locked up, it allows you to sync your
 disks and will certainly lessen the chance of data loss and fscking. Note