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

Commit 4e202284 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'sched/urgent'; commit 'v2.6.28' into sched/core

parents 826e08b0 80f40ee4 4a6908a3

Documentation/arm/mem_alignment

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ real bad - it changes the behaviour of all unaligned instructions in user 
space, and might cause programs to fail unexpectedly.



To change the alignment trap behavior, simply echo a number into

/proc/sys/debug/alignment.  The number is made up from various bits:

/proc/cpu/alignment.  The number is made up from various bits:



bit		behavior when set

---		-----------------

Documentation/kernel-parameters.txt

+7 −4
Original line number Diff line number Diff line
@@ -220,14 +220,17 @@ and is between 256 and 4096 characters. It is defined in the file 
			Bits in debug_level correspond to a level in

			ACPI_DEBUG_PRINT statements, e.g.,

			    ACPI_DEBUG_PRINT((ACPI_DB_INFO, ...

			See Documentation/acpi/debug.txt for more information

			about debug layers and levels.

			The debug_level mask defaults to "info".  See

			Documentation/acpi/debug.txt for more information about

			debug layers and levels.



			Enable processor driver info messages:

			    acpi.debug_layer=0x20000000

			Enable PCI/PCI interrupt routing info messages:

			    acpi.debug_layer=0x400000

			Enable AML "Debug" output, i.e., stores to the Debug

			object while interpreting AML:

			    acpi.debug_layer=0xffffffff acpi.debug_level=0x2

			Enable PCI/PCI interrupt routing info messages:

			    acpi.debug_layer=0x400000 acpi.debug_level=0x4

			Enable all messages related to ACPI hardware:

			    acpi.debug_layer=0x2 acpi.debug_level=0xffffffff

Documentation/sound/alsa/ALSA-Configuration.txt

+2 −0
Original line number Diff line number Diff line
@@ -1063,6 +1063,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 


	STAC9227/9228/9229/927x

	  ref		Reference board

	  ref-no-jd	Reference board without HP/Mic jack detection

	  3stack	D965 3stack

	  5stack	D965 5stack + SPDIF

	  dell-3stack	Dell Dimension E520
@@ -1076,6 +1077,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 


	STAC92HD73*

	  ref		Reference board

	  no-jd		BIOS setup but without jack-detection

	  dell-m6-amic	Dell desktops/laptops with analog mics

	  dell-m6-dmic	Dell desktops/laptops with digital mics

	  dell-m6	Dell desktops/laptops with both type of mics

Documentation/usb/gadget_serial.txt

+2 −2
Original line number Diff line number Diff line
@@ -114,11 +114,11 @@ modules. 
Then you must load the gadget serial driver.  To load it as an

ACM device (recommended for interoperability), do this:



  modprobe g_serial use_acm=1

  modprobe g_serial



To load it as a vendor specific bulk in/out device, do this:



  modprobe g_serial

  modprobe g_serial use_acm=0



This will also automatically load the underlying gadget peripheral

controller driver.  This must be done each time you reboot the gadget

Documentation/usb/proc_usb_info.txt

+4 −2
Original line number Diff line number Diff line
@@ -49,8 +49,10 @@ it and 002/048 sometime later. 


These files can be read as binary data.  The binary data consists

of first the device descriptor, then the descriptors for each

configuration of the device.  That information is also shown in

text form by the /proc/bus/usb/devices file, described later.

configuration of the device.  Multi-byte fields in the device and

configuration descriptors, but not other descriptors, are converted

to host endianness by the kernel.  This information is also shown

in text form by the /proc/bus/usb/devices file, described later.



These files may also be used to write user-level drivers for the USB

devices.  You would open the /proc/bus/usb/BBB/DDD file read/write,