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

Commit d15a88fc authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'master' into upstream

parents b5347171 1def630a

Documentation/serial/driver

+5 −4
Original line number Diff line number Diff line
@@ -214,12 +214,13 @@ hardware. 
	The interaction of the iflag bits is as follows (parity error

	given as an example):

	Parity error	INPCK	IGNPAR

	None		n/a	n/a	character received

	Yes		n/a	0	character discarded

	Yes		0	1	character received, marked as

	n/a		0	n/a	character received, marked as

					TTY_NORMAL

	Yes		1	1	character received, marked as

	None		1	n/a	character received, marked as

					TTY_NORMAL

	Yes		1	0	character received, marked as

					TTY_PARITY

	Yes		1	1	character discarded



	Other flags may be used (eg, xon/xoff characters) if your

	hardware supports hardware "soft" flow control.

MAINTAINERS

+17 −0
Original line number Diff line number Diff line
@@ -568,6 +568,18 @@ L: linuxppc-dev@ozlabs.org 
W:	http://www.penguinppc.org/ppc64/

S:	Supported



BROADCOM BNX2 GIGABIT ETHERNET DRIVER

P:	Michael Chan

M:	mchan@broadcom.com

L:	netdev@vger.kernel.org

S:	Supported



BROADCOM TG3 GIGABIT ETHERNET DRIVER

P:	Michael Chan

M:	mchan@broadcom.com

L:	netdev@vger.kernel.org

S:	Supported



BTTV VIDEO4LINUX DRIVER

P:	Mauro Carvalho Chehab

M:	mchehab@infradead.org
@@ -1883,6 +1895,11 @@ L: linux-kernel@vger.kernel.org 
W:	http://www.atnf.csiro.au/~rgooch/linux/kernel-patches.html

S:	Maintained



MULTIMEDIA CARD SUBSYSTEM

P:	Russell King

M:	rmk+mmc@arm.linux.org.uk

S:	Maintained



MULTISOUND SOUND DRIVER

P:	Andrew Veliath

M:	andrewtv@usa.net

Makefile

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

PATCHLEVEL = 6

SUBLEVEL = 17

EXTRAVERSION =-rc5

NAME=Lordi Rules

EXTRAVERSION =-rc6

NAME=Crazed Snow-Weasel



# *DOCUMENTATION*

# To see a list of typical targets execute "make help"

arch/alpha/kernel/alpha_ksyms.c

+0 −1
Original line number Diff line number Diff line
@@ -182,7 +182,6 @@ EXPORT_SYMBOL(smp_num_cpus); 
EXPORT_SYMBOL(smp_call_function);

EXPORT_SYMBOL(smp_call_function_on_cpu);

EXPORT_SYMBOL(_atomic_dec_and_lock);

EXPORT_SYMBOL(cpu_present_mask);

#endif /* CONFIG_SMP */



/*

arch/alpha/kernel/process.c

+3 −3
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ common_shutdown_1(void *generic_ptr) 
	if (cpuid != boot_cpuid) {

		flags |= 0x00040000UL; /* "remain halted" */

		*pflags = flags;

		clear_bit(cpuid, &cpu_present_mask);

		cpu_clear(cpuid, cpu_present_map);

		halt();

	}

#endif
@@ -120,8 +120,8 @@ common_shutdown_1(void *generic_ptr) 


#ifdef CONFIG_SMP

	/* Wait for the secondaries to halt. */

	cpu_clear(boot_cpuid, cpu_possible_map);

	while (cpus_weight(cpu_possible_map))

	cpu_clear(boot_cpuid, cpu_present_map);

	while (cpus_weight(cpu_present_map))

		barrier();

#endif