Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 13efdbec authored by Russell King's avatar Russell King Committed by Russell King
Browse files

Merge branch 'pm-upstream/fixes' of... 

Merge branch 'pm-upstream/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into devel-stable
parents 61f4a10c 6fd210a9

CREDITS

+6 −0
Original line number Diff line number Diff line
@@ -2006,6 +2006,9 @@ 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/
@@ -3802,6 +3805,9 @@ 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,

Documentation/filesystems/sysfs.txt

+2 −1
Original line number Diff line number Diff line
@@ -23,7 +23,8 @@ interface. 
Using sysfs

~~~~~~~~~~~



sysfs is always compiled in. You can access it by doing:

sysfs is always compiled in if CONFIG_SYSFS is defined. You can access

it by doing:



    mount -t sysfs sysfs /sys

Documentation/lguest/lguest.c

+483 −238

File changed.

Preview size limit exceeded, changes collapsed.

Documentation/sound/alsa/Procfile.txt

+5 −0
Original line number Diff line number Diff line
@@ -101,6 +101,8 @@ card*/pcm*/xrun_debug 
	  bit 0 = Enable XRUN/jiffies debug messages

	  bit 1 = Show stack trace at XRUN / jiffies check

	  bit 2 = Enable additional jiffies check

	  bit 3 = Log hwptr update at each period interrupt

	  bit 4 = Log hwptr update at each snd_pcm_update_hw_ptr()



	When the bit 0 is set, the driver will show the messages to

	kernel log when an xrun is detected.  The debug message is
@@ -117,6 +119,9 @@ card*/pcm*/xrun_debug 
	buggy) hardware that doesn't give smooth pointer updates.

	This feature is enabled via the bit 2.



	Bits 3 and 4 are for logging the hwptr records.  Note that

	these will give flood of kernel messages.



card*/pcm*/sub*/info

	The general information of this PCM sub-stream.

Documentation/sysrq.txt

+4 −3
Original line number Diff line number Diff line
@@ -66,7 +66,8 @@ 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 kexec reboot in order to take a crashdump.

'c'	- Will perform a system crash by a NULL pointer dereference.

          A crashdump will be taken if configured.



'd'	- Shows all locks that are held.
@@ -141,8 +142,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'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.

'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.



'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