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

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 



Conflicts:
	drivers/net/vmxnet3/vmxnet3_drv.c

Small vmxnet3 conflict with header size bug fix in 'net'.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 036dafa2 f3969bf7

Documentation/kernel-parameters.txt

+6 −0
Original line number Diff line number Diff line
@@ -2211,6 +2211,12 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 


			default: off.



	printk.always_kmsg_dump=

			Trigger kmsg_dump for cases other than kernel oops or

			panics

			Format: <bool>  (1/Y/y=enable, 0/N/n=disable)

			default: disabled



	printk.time=	Show timing data prefixed to each printk message line

			Format: <bool>  (1/Y/y=enable, 0/N/n=disable)

MAINTAINERS

+5 −5
Original line number Diff line number Diff line
@@ -1310,7 +1310,7 @@ F: drivers/atm/ 
F:	include/linux/atm*



ATMEL AT91 MCI DRIVER

M:	Nicolas Ferre <nicolas.ferre@atmel.com>

M:	Ludovic Desroches <ludovic.desroches@atmel.com>

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

W:	http://www.atmel.com/products/AT91/

W:	http://www.at91.com/
@@ -1318,7 +1318,7 @@ S: Maintained 
F:	drivers/mmc/host/at91_mci.c



ATMEL AT91 / AT32 MCI DRIVER

M:	Nicolas Ferre <nicolas.ferre@atmel.com>

M:	Ludovic Desroches <ludovic.desroches@atmel.com>

S:	Maintained

F:	drivers/mmc/host/atmel-mci.c

F:	drivers/mmc/host/atmel-mci-regs.h
@@ -3781,7 +3781,7 @@ F: Documentation/kdump/ 


KERNEL AUTOMOUNTER v4 (AUTOFS4)

M:	Ian Kent <raven@themaw.net>

L:	autofs@linux.kernel.org

L:	autofs@vger.kernel.org

S:	Maintained

F:	fs/autofs4/
@@ -4686,7 +4686,7 @@ NTFS FILESYSTEM 
M:	Anton Altaparmakov <anton@tuxera.com>

L:	linux-ntfs-dev@lists.sourceforge.net

W:	http://www.tuxera.com/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/aia21/ntfs-2.6.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/aia21/ntfs.git

S:	Supported

F:	Documentation/filesystems/ntfs.txt

F:	fs/ntfs/
@@ -7270,7 +7270,7 @@ WATCHDOG DEVICE DRIVERS 
M:	Wim Van Sebroeck <wim@iguana.be>

L:	linux-watchdog@vger.kernel.org

W:	http://www.linux-watchdog.org/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog.git

T:	git git://www.linux-watchdog.org/linux-watchdog.git

S:	Maintained

F:	Documentation/watchdog/

F:	drivers/watchdog/

Makefile

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

PATCHLEVEL = 3

SUBLEVEL = 0

EXTRAVERSION = -rc5

EXTRAVERSION = -rc6

NAME = Saber-toothed Squirrel



# *DOCUMENTATION*

arch/alpha/include/asm/futex.h

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr, 
	"	lda	$31,3b-2b(%0)\n"

	"	.previous\n"

	:	"+r"(ret), "=&r"(prev), "=&r"(cmp)

	:	"r"(uaddr), "r"((long)oldval), "r"(newval)

	:	"r"(uaddr), "r"((long)(int)oldval), "r"(newval)

	:	"memory");



	*uval = prev;

arch/arm/mach-lpc32xx/include/mach/irqs.h

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ 
 */

#define IRQ_LPC32XX_JTAG_COMM_TX	LPC32XX_SIC1_IRQ(1)

#define IRQ_LPC32XX_JTAG_COMM_RX	LPC32XX_SIC1_IRQ(2)

#define IRQ_LPC32XX_GPI_11		LPC32XX_SIC1_IRQ(4)

#define IRQ_LPC32XX_GPI_28		LPC32XX_SIC1_IRQ(4)

#define IRQ_LPC32XX_TS_P		LPC32XX_SIC1_IRQ(6)

#define IRQ_LPC32XX_TS_IRQ		LPC32XX_SIC1_IRQ(7)

#define IRQ_LPC32XX_TS_AUX		LPC32XX_SIC1_IRQ(8)