Merge branches 'tracing/ftrace', 'tracing/hw-branch-tracing' and... (5250d329) · Commits · e / devices / android_kernel_teracube_2e

Documentation/kernel-parameters.txt

+7 −4

Original line number	Diff line number	Diff line
		@@ -221,14 +221,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

+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

+3 −3

Original line number	Diff line number	Diff line
		@@ -2191,9 +2191,9 @@ S: Supported

		INOTIFY
		P: John McCutchan
		M: ttb@tentacle.dhs.org
		M: john@johnmccutchan.com
		P: Robert Love
		M: rml@novell.com
		M: rlove@rlove.org
		L: linux-kernel@vger.kernel.org
		S: Maintained

		@@ -4529,7 +4529,7 @@ S: Maintained
		USB VIDEO CLASS
		P: Laurent Pinchart
		M: laurent.pinchart@skynet.be
		L: linux-uvc-devel@lists.berlios.de
		L: linux-uvc-devel@lists.berlios.de (subscribers-only)
		L: video4linux-list@redhat.com
		W: http://linux-uvc.berlios.de
		S: Maintained

+1 −1

+1 −1

Original line number	Diff line number	Diff line
		@@ -13,7 +13,7 @@
		#include <linux/mtd/partitions.h>
		#include <linux/mtd/physmap.h>

		#include <asm/arch/smc.h>
		#include <mach/smc.h>

		static struct smc_timing flash_timing __initdata = {
		.ncs_read_setup = 0,