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

Commit 492c032b authored by Grant Likely's avatar Grant Likely
Browse files

Merge commit 'v2.6.36-rc7' into spi/next

parents f9d629c7 cb655d0f

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>
@@ -3781,9 +3788,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
@@ -3970,8 +3976,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/oprofile/common.c

+5 −2
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ static int op_create_counter(int cpu, int event) 
	if (IS_ERR(pevent)) {

		ret = PTR_ERR(pevent);

	} else if (pevent->state != PERF_EVENT_STATE_ACTIVE) {

		perf_event_release_kernel(pevent);

		pr_warning("oprofile: failed to enable event %d "

				"on CPU %d\n", event, cpu);

		ret = -EBUSY;
@@ -365,6 +366,7 @@ int __init oprofile_arch_init(struct oprofile_operations *ops) 
	ret = init_driverfs();

	if (ret) {

		kfree(counter_config);

		counter_config = NULL;

		return ret;

	}
@@ -402,7 +404,6 @@ void oprofile_arch_exit(void) 
	struct perf_event *event;



	if (*perf_events) {

		exit_driverfs();

		for_each_possible_cpu(cpu) {

			for (id = 0; id < perf_num_counters; ++id) {

				event = perf_events[cpu][id];
@@ -413,8 +414,10 @@ void oprofile_arch_exit(void) 
		}

	}



	if (counter_config)

	if (counter_config) {

		kfree(counter_config);

		exit_driverfs();

	}

}

#else

int __init oprofile_arch_init(struct oprofile_operations *ops)