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

Commit 51563cd5 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge branch 'tip/rtmutex' of... 

Merge branch 'tip/rtmutex' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into core/locking

*git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace tip/rtmutex:
   rtmutex: Simplify PI algorithm and make highest prio task get lock
parents d1233754 8161239a

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ Andy Adamson <andros@citi.umich.edu> 
Arnaud Patard <arnaud.patard@rtp-net.org>

Arnd Bergmann <arnd@arndb.de>

Axel Dyks <xl@xlsigned.net>

Axel Lin <axel.lin@gmail.com>

Ben Gardner <bgardner@wabtec.com>

Ben M Cahill <ben.m.cahill@intel.com>

Björn Steinbrink <B.Steinbrink@gmx.de>

Documentation/DocBook/device-drivers.tmpl

+2 −2
Original line number Diff line number Diff line
@@ -217,8 +217,8 @@ X!Isound/sound_firmware.c 
  <chapter id="uart16x50">

     <title>16x50 UART Driver</title>

!Iinclude/linux/serial_core.h

!Edrivers/serial/serial_core.c

!Edrivers/serial/8250.c

!Edrivers/tty/serial/serial_core.c

!Edrivers/tty/serial/8250.c

  </chapter>



  <chapter id="fbdev">

Documentation/kernel-parameters.txt

+2 −2
Original line number Diff line number Diff line
@@ -43,11 +43,11 @@ parameter is applicable: 
	AVR32	AVR32 architecture is enabled.

	AX25	Appropriate AX.25 support is enabled.

	BLACKFIN Blackfin architecture is enabled.

	DRM	Direct Rendering Management support is enabled.

	DYNAMIC_DEBUG Build in debug messages and enable them at runtime

	EDD	BIOS Enhanced Disk Drive Services (EDD) is enabled

	EFI	EFI Partitioning (GPT) is enabled

	EIDE	EIDE/ATAPI support is enabled.

	DRM	Direct Rendering Management support is enabled.

	DYNAMIC_DEBUG Build in debug messages and enable them at runtime

	FB	The frame buffer device is enabled.

	GCOV	GCOV profiling is enabled.

	HW	Appropriate hardware is enabled.

MAINTAINERS

+22 −0
Original line number Diff line number Diff line
@@ -3674,6 +3674,28 @@ F: include/linux/key-type.h 
F:	include/keys/

F:	security/keys/



KEYS-TRUSTED

M:	David Safford <safford@watson.ibm.com>

M:	Mimi Zohar <zohar@us.ibm.com>

L:	linux-security-module@vger.kernel.org

L:	keyrings@linux-nfs.org

S:	Supported

F:	Documentation/keys-trusted-encrypted.txt

F:	include/keys/trusted-type.h

F:	security/keys/trusted.c

F:	security/keys/trusted.h



KEYS-ENCRYPTED

M:	Mimi Zohar <zohar@us.ibm.com>

M:	David Safford <safford@watson.ibm.com>

L:	linux-security-module@vger.kernel.org

L:	keyrings@linux-nfs.org

S:	Supported

F:	Documentation/keys-trusted-encrypted.txt

F:	include/keys/encrypted-type.h

F:	security/keys/encrypted.c

F:	security/keys/encrypted.h



KGDB / KDB /debug_core

M:	Jason Wessel <jason.wessel@windriver.com>

W:	http://kgdb.wiki.kernel.org/

arch/arm/include/asm/hardware/sp810.h

+6 −0
Original line number Diff line number Diff line
@@ -50,6 +50,12 @@ 
#define SCPCELLID2		0xFF8

#define SCPCELLID3		0xFFC



#define SCCTRL_TIMEREN0SEL_REFCLK	(0 << 15)

#define SCCTRL_TIMEREN0SEL_TIMCLK	(1 << 15)



#define SCCTRL_TIMEREN1SEL_REFCLK	(0 << 17)

#define SCCTRL_TIMEREN1SEL_TIMCLK	(1 << 17)



static inline void sysctl_soft_reset(void __iomem *base)

{

	/* writing any value to SCSYSSTAT reg will reset system */