From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 13 Jun 2008 16:47:07 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6
X-Git-Tag: v2.6.26-rc7~38
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=7775c9753b94fe429dc4323360d6502c95e0dd6e;hp=-c

Merge git://git./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"
---

7775c9753b94fe429dc4323360d6502c95e0dd6e
diff --combined MAINTAINERS
index a536396a4af1,01605a9b95e7..cd587eec9fa7
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -274,7 -274,7 +274,7 @@@ S:      Maintaine
  
  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
@@@ -995,8 -995,8 +995,8 @@@ L:	netdev@vger.kernel.or
  S:	Supported
  
  BROADCOM BNX2X 10 GIGABIT ETHERNET DRIVER
 -P:	Eliezer Tamir
 -M:	eliezert@broadcom.com
 +P:	Eilon Greenstein
 +M:	eilong@broadcom.com
  L:	netdev@vger.kernel.org
  S:	Supported
  
@@@ -1202,7 -1202,6 +1202,7 @@@ M:	pj@sgi.co
  M:	menage@google.com
  L:	linux-kernel@vger.kernel.org
  W:	http://www.bullopensource.org/cpuset/
 +W:	http://oss.sgi.com/projects/cpusets/
  S:	Supported
  
  CRAMFS FILESYSTEM
@@@ -1828,7 -1827,7 +1828,7 @@@ S:	Maintaine
  
  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 -3120,7 +3121,7 @@@ S:	Maintaine
  
  PARISC ARCHITECTURE
  P:	Kyle McMartin
- M:	kyle@parisc-linux.org
+ M:	kyle@mcmartin.ca
  P:	Matthew Wilcox
  M:	matthew@wil.cx
  P:	Grant Grundler
@@@ -3330,11 -3329,9 +3330,11 @@@ L:	video4linux-list@redhat.co
  W:	http://www.isely.net/pvrusb2/
  S:	Maintained
  
 -PXA2xx SUPPORT
 -P:	Nicolas Pitre
 -M:	nico@cam.org
 +PXA2xx/PXA3xx SUPPORT
 +P:	Eric Miao
 +M:	eric.miao@marvell.com
 +P:	Russell King
 +M:	linux@arm.linux.org.uk
  L:	linux-arm-kernel@lists.arm.linux.org.uk	(subscribers-only)
  S:	Maintained
  
@@@ -4026,7 -4023,7 +4026,7 @@@ TULIP NETWORK DRIVER
  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