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

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

Merge branch 'master'

parents 49430f97 e9bb4c99

MAINTAINERS

+17 −1
Original line number Diff line number Diff line
@@ -2232,7 +2232,23 @@ P: Martin Schwidefsky 
M:	schwidefsky@de.ibm.com

M:	linux390@de.ibm.com

L:	linux-390@vm.marist.edu

W:	http://oss.software.ibm.com/developerworks/opensource/linux390

W:	http://www.ibm.com/developerworks/linux/linux390/

S:	Supported



S390 NETWORK DRIVERS

P:	Frank Pavlic

M:	fpavlic@de.ibm.com

M:	linux390@de.ibm.com

L:	linux-390@vm.marist.edu

W:	http://www.ibm.com/developerworks/linux/linux390/

S:	Supported



S390 ZFCP DRIVER

P:	Andreas Herrmann

M:	aherrman@de.ibm.com

M:	linux390@de.ibm.com

L:	linux-390@vm.marist.edu

W:	http://www.ibm.com/developerworks/linux/linux390/

S:	Supported



SAA7146 VIDEO4LINUX-2 DRIVER

Makefile

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

PATCHLEVEL = 6

SUBLEVEL = 16

EXTRAVERSION =-rc2

EXTRAVERSION =-rc3

NAME=Sliding Snow Leopard



# *DOCUMENTATION*

arch/i386/kernel/head.S

+4 −0
Original line number Diff line number Diff line
@@ -398,7 +398,11 @@ ignore_int: 
	pushl 32(%esp)

	pushl 40(%esp)

	pushl $int_msg

#ifdef CONFIG_EARLY_PRINTK

	call early_printk

#else

	call printk

#endif

	addl $(5*4),%esp

	popl %ds

	popl %es

arch/i386/kernel/syscall_table.S

+1 −1
Original line number Diff line number Diff line
@@ -299,7 +299,7 @@ ENTRY(sys_call_table) 
	.long sys_mknodat

	.long sys_fchownat

	.long sys_futimesat

	.long sys_newfstatat		/* 300 */

	.long sys_fstatat64		/* 300 */

	.long sys_unlinkat

	.long sys_renameat

	.long sys_linkat

arch/m68k/fpsp040/bindec.S

+2 −3
Original line number Diff line number Diff line
@@ -131,9 +131,8 @@ 
|		Copyright (C) Motorola, Inc. 1990

|			All Rights Reserved

|

|	THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA

|	The copyright notice above does not evidence any

|	actual or intended publication of such source code.

|       For details on the license for this file, please see the

|       file, README, in this same directory.



|BINDEC    idnt    2,1 | Motorola 040 Floating Point Software Package