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

Commit 33175d84 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 

Conflicts:
	drivers/net/bnx2x/bnx2x_cmn.c
parents c5908939 6dfbd87a

MAINTAINERS

+12 −5
Original line number Diff line number Diff line
@@ -1010,6 +1010,15 @@ L: linux-samsung-soc@vger.kernel.org (moderated for non-subscribers) 
S:	Maintained

F:	arch/arm/mach-s5p*/



ARM/SAMSUNG MOBILE MACHINE SUPPORT

M:	Kyungmin Park <kyungmin.park@samsung.com>

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

S:	Maintained

F:	arch/arm/mach-s5pv210/mach-aquila.c

F:	arch/arm/mach-s5pv210/mach-goni.c

F:	arch/arm/mach-exynos4/mach-universal_c210.c

F:	arch/arm/mach-exynos4/mach-nuri.c



ARM/SAMSUNG S5P SERIES FIMC SUPPORT

M:	Kyungmin Park <kyungmin.park@samsung.com>

M:	Sylwester Nawrocki <s.nawrocki@samsung.com>
@@ -3521,7 +3530,7 @@ F: drivers/hwmon/jc42.c 
F:	Documentation/hwmon/jc42



JFS FILESYSTEM

M:	Dave Kleikamp <shaggy@linux.vnet.ibm.com>

M:	Dave Kleikamp <shaggy@kernel.org>

L:	jfs-discussion@lists.sourceforge.net

W:	http://jfs.sourceforge.net/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git
@@ -4284,10 +4293,7 @@ S: Maintained 
F:	net/sched/sch_netem.c



NETERION 10GbE DRIVERS (s2io/vxge)

M:	Ramkrishna Vepa <ramkrishna.vepa@exar.com>

M:	Sivakumar Subramani <sivakumar.subramani@exar.com>

M:	Sreenivasa Honnur <sreenivasa.honnur@exar.com>

M:	Jon Mason <jon.mason@exar.com>

M:	Jon Mason <jdmason@kudzu.us>

L:	netdev@vger.kernel.org

W:	http://trac.neterion.com/cgi-bin/trac.cgi/wiki/Linux?Anonymous

W:	http://trac.neterion.com/cgi-bin/trac.cgi/wiki/X3100Linux?Anonymous
@@ -5174,6 +5180,7 @@ F: drivers/char/random.c 


RAPIDIO SUBSYSTEM

M:	Matt Porter <mporter@kernel.crashing.org>

M:	Alexandre Bounine <alexandre.bounine@idt.com>

S:	Maintained

F:	drivers/rapidio/

Makefile

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

PATCHLEVEL = 6

SUBLEVEL = 38

EXTRAVERSION = -rc7

EXTRAVERSION = -rc8

NAME = Flesh-Eating Bats with Fangs



# *DOCUMENTATION*

arch/alpha/kernel/sys_titan.c

+1 −0
Original line number Diff line number Diff line
@@ -149,6 +149,7 @@ static int 
titan_set_irq_affinity(struct irq_data *d, const struct cpumask *affinity,

		       bool force)

{ 

	unsigned int irq = d->irq;

	spin_lock(&titan_irq_lock);

	titan_cpu_set_irq_affinity(irq - 16, *affinity);

	titan_update_irq_hw(titan_cached_irq_mask);

arch/arm/common/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ config ARM_VIC 


config ARM_VIC_NR

	int

	default 4 if ARCH_S5PV210

	default 3 if ARCH_S5P6442 || ARCH_S5PC100

	default 2

	depends on ARM_VIC

	help

arch/arm/include/asm/mach/arch.h

+0 −4
Original line number Diff line number Diff line
@@ -15,10 +15,6 @@ struct meminfo; 
struct sys_timer;



struct machine_desc {

	/*

	 * Note! The first two elements are used

	 * by assembler code in head.S, head-common.S

	 */

	unsigned int		nr;		/* architecture number	*/

	const char		*name;		/* architecture name	*/

	unsigned long		boot_params;	/* tagged list		*/