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

Commit 7775c975 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
  parisc: update my email address
  parisc: fix miscompilation of ip_fast_csum with gcc >= 4.3
  parisc: fix off by one in setup_sigcontext32
  parisc: export empty_zero_page
  parisc: export copy_user_page_asm
  parisc: move head.S to head.text section
  Revert "parisc: fix trivial section name warnings"
parents fa8d84b7 42a5a8a6

MAINTAINERS

+4 −4
Original line number Diff line number Diff line
@@ -274,7 +274,7 @@ S: Maintained 


AD1889 ALSA SOUND DRIVER

P:     Kyle McMartin

M:     kyle@parisc-linux.org

M:     kyle@mcmartin.ca

P:     Thibaut Varene

M:     T-Bone@parisc-linux.org

W:     http://wiki.parisc-linux.org/AD1889
@@ -1828,7 +1828,7 @@ S: Maintained 


HARMONY SOUND DRIVER

P:	Kyle McMartin

M:	kyle@parisc-linux.org

M:	kyle@mcmartin.ca

L:	linux-parisc@vger.kernel.org

S:	Maintained
@@ -3121,7 +3121,7 @@ S: Maintained 


PARISC ARCHITECTURE

P:	Kyle McMartin

M:	kyle@parisc-linux.org

M:	kyle@mcmartin.ca

P:	Matthew Wilcox

M:	matthew@wil.cx

P:	Grant Grundler
@@ -4026,7 +4026,7 @@ TULIP NETWORK DRIVERS 
P:	Grant Grundler

M:	grundler@parisc-linux.org

P:	Kyle McMartin

M:	kyle@parisc-linux.org

M:	kyle@mcmartin.ca

L:	netdev@vger.kernel.org

S:	Maintained

arch/parisc/hpux/gate.S

+1 −2
Original line number Diff line number Diff line
@@ -13,10 +13,9 @@ 
#include <asm/unistd.h>

#include <asm/errno.h>

#include <linux/linkage.h>

#include <linux/init.h>



	.level	LEVEL

	__HEAD

	.text



	.import hpux_call_table

	.import hpux_syscall_exit,code

arch/parisc/hpux/wrappers.S

+1 −2
Original line number Diff line number Diff line
@@ -28,10 +28,9 @@ 
#include <asm/assembly.h>

#include <asm/signal.h>

#include <linux/linkage.h>

#include <linux/init.h>



	.level	LEVEL

	__HEAD

	.text



	/* These should probably go in a header file somewhere.

	 * They are duplicated in kernel/wrappers.S

arch/parisc/kernel/entry.S

+1 −2
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ 
#include <asm/thread_info.h>



#include <linux/linkage.h>

#include <linux/init.h>



#ifdef CONFIG_64BIT

	.level 2.0w
@@ -622,7 +621,7 @@ 
	 * the static part of the kernel address space.

	 */



	__HEAD

	.text



	.align	PAGE_SIZE

arch/parisc/kernel/head.S

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ ENTRY(boot_args) 
END(boot_args)



	__HEAD



	.align	4

	.import init_thread_union,data

	.import fault_vector_20,code    /* IVA parisc 2.0 32 bit */