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

Commit 79a66b96 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branches 'x86/pat2' and 'x86/fpu'; commit 'v2.6.28' into x86/core

parents bed4f130 c1c15b65 1fcccb00 4a6908a3

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

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -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

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 2

PATCHLEVEL = 6

SUBLEVEL = 28

EXTRAVERSION = -rc9

EXTRAVERSION =

NAME = Erotic Pickled Herring



# *DOCUMENTATION*

arch/mips/include/asm/byteorder.h

+2 −3
Original line number Diff line number Diff line
@@ -51,8 +51,7 @@ static inline __attribute_const__ __u64 __arch_swab64(__u64 x) 
{

	__asm__(

	"	dsbh	%0, %1\n"

	"	dshd	%0, %0			\n"

	"	drotr	%0, %0, 32		\n"

	"	dshd	%0, %0"

	: "=r" (x)

	: "r" (x));

arch/mips/include/asm/elf.h

+1 −1
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG]; 
 */

#ifdef __MIPSEB__

#define ELF_DATA	ELFDATA2MSB

#elif __MIPSEL__

#elif defined(__MIPSEL__)

#define ELF_DATA	ELFDATA2LSB

#endif

#define ELF_ARCH	EM_MIPS