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

Commit 552dc340 authored by Russell King's avatar Russell King
Browse files

Merge branch 'for_rmk' of git://github.com/at91linux/linux-2.6-at91 into devel-stable

parents a9fda02b ee621dd6

CREDITS

+4 −4
Original line number Diff line number Diff line
@@ -3554,12 +3554,12 @@ E: cvance@nai.com 
D: portions of the Linux Security Module (LSM) framework and security modules



N: Petr Vandrovec

E: vandrove@vc.cvut.cz

E: petr@vandrovec.name

D: Small contributions to ncpfs

D: Matrox framebuffer driver

S: Chudenicka 8

S: 10200 Prague 10, Hostivar

S: Czech Republic

S: 21513 Conradia Ct

S: Cupertino, CA 95014

S: USA



N: Thibaut Varene

E: T-Bone@parisc-linux.org

MAINTAINERS

+10 −4
Original line number Diff line number Diff line
@@ -962,6 +962,13 @@ W: http://www.fluff.org/ben/linux/ 
S:	Maintained

F:	arch/arm/mach-s3c6410/



ARM/S5P ARM ARCHITECTURES

M:	Kukjin Kim <kgene.kim@samsung.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

L:	linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)

S:	Maintained

F:	arch/arm/mach-s5p*/



ARM/SHMOBILE ARM ARCHITECTURE

M:	Paul Mundt <lethal@linux-sh.org>

M:	Magnus Damm <magnus.damm@gmail.com>
@@ -3788,9 +3795,8 @@ W: http://www.syskonnect.com 
S:	Supported



MATROX FRAMEBUFFER DRIVER

M:	Petr Vandrovec <vandrove@vc.cvut.cz>

L:	linux-fbdev@vger.kernel.org

S:	Maintained

S:	Orphan

F:	drivers/video/matrox/matroxfb_*

F:	include/linux/matroxfb.h
@@ -3977,8 +3983,8 @@ S: Maintained 
F:	drivers/net/natsemi.c



NCP FILESYSTEM

M:	Petr Vandrovec <vandrove@vc.cvut.cz>

S:	Maintained

M:	Petr Vandrovec <petr@vandrovec.name>

S:	Odd Fixes

F:	fs/ncpfs/



NCR DUAL 700 SCSI DRIVER (MICROCHANNEL)

Makefile

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

PATCHLEVEL = 6

SUBLEVEL = 36

EXTRAVERSION = -rc6

EXTRAVERSION = -rc7

NAME = Sheep on Meth



# *DOCUMENTATION*

arch/alpha/kernel/signal.c

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ SYSCALL_DEFINE2(osf_sigprocmask, int, how, unsigned long, newmask) 
	sigset_t mask;

	unsigned long res;



	siginitset(&mask, newmask & ~_BLOCKABLE);

	siginitset(&mask, newmask & _BLOCKABLE);

	res = sigprocmask(how, &mask, &oldmask);

	if (!res) {

		force_successful_syscall_return();

arch/arm/configs/at91sam9g20ek_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ CONFIG_MODULE_UNLOAD=y 
CONFIG_ARCH_AT91=y

CONFIG_ARCH_AT91SAM9G20=y

CONFIG_MACH_AT91SAM9G20EK=y

CONFIG_MACH_AT91SAM9G20EK_2MMC=y

CONFIG_AT91_PROGRAMMABLE_CLOCKS=y

# CONFIG_ARM_THUMB is not set

CONFIG_AEABI=y