Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
  agp: parisc-agp.c - use correct page_mask function
  parisc: Fix linker script breakage.
  parisc: convert to asm-generic/hardirq.h
  parisc: Make THREAD_SIZE available to assembly files and linker scripts.
  parisc: correct use of SHF_ALLOC
  parisc: rename parisc's vmalloc_start to parisc_vmalloc_start
  parisc: add me to Maintainers
  parisc: includecheck fix: signal.c
  parisc: HAVE_ARCH_TRACEHOOK
  parisc: add skeleton syscall.h
  parisc: stop using task->ptrace for {single,block}step flags
  parisc: split syscall_trace into two halves
  parisc: add missing TI_TASK macro in syscall.S
  parisc: tracehook_signal_handler
  parisc: tracehook_report_syscall

diff --combined MAINTAINERS
index 09a2028bab7f78786266c10fe1d2f99b0e1e263c,a51b896528c8de9104cb1b0f559b5553390dc76e..571900efeb2635d374dc97f2d1095fc5fcf747d1
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -257,13 -257,6 +257,13 @@@ W:       http://www.lesswatts.org/projects/ac
  S:    Supported
  F:    drivers/acpi/fan.c
  
 +ACPI PROCESSOR AGGREGATOR DRIVER
 +M:    Shaohua Li <shaohua.li@intel.com>
 +L:    linux-acpi@vger.kernel.org
 +W:    http://www.lesswatts.org/projects/acpi/
 +S:    Supported
 +F:    drivers/acpi/acpi_pad.c
 +
  ACPI THERMAL DRIVER
  M:    Zhang Rui <rui.zhang@intel.com>
  L:    linux-acpi@vger.kernel.org
@@@ -653,24 -646,24 +653,24 @@@ ARM/INTEL IOP32X ARM ARCHITECTUR
  M:    Lennert Buytenhek <kernel@wantstofly.org>
  M:    Dan Williams <dan.j.williams@intel.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -S:    Supported
 +S:    Maintained
  
  ARM/INTEL IOP33X ARM ARCHITECTURE
  M:    Dan Williams <dan.j.williams@intel.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -S:    Supported
 +S:    Maintained
  
  ARM/INTEL IOP13XX ARM ARCHITECTURE
  M:    Lennert Buytenhek <kernel@wantstofly.org>
  M:    Dan Williams <dan.j.williams@intel.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -S:    Supported
 +S:    Maintained
  
  ARM/INTEL IQ81342EX MACHINE SUPPORT
  M:    Lennert Buytenhek <kernel@wantstofly.org>
  M:    Dan Williams <dan.j.williams@intel.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -S:    Supported
 +S:    Maintained
  
  ARM/INTEL IXP2000 ARM ARCHITECTURE
  M:    Lennert Buytenhek <kernel@wantstofly.org>
@@@ -698,7 -691,7 +698,7 @@@ ARM/INTEL XSC3 (MANZANO) ARM COR
  M:    Lennert Buytenhek <kernel@wantstofly.org>
  M:    Dan Williams <dan.j.williams@intel.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -S:    Supported
 +S:    Maintained
  
  ARM/IP FABRICS DOUBLE ESPRESSO MACHINE SUPPORT
  M:    Lennert Buytenhek <kernel@wantstofly.org>
@@@ -748,36 -741,23 +748,36 @@@ M:      Dirk Opfer <dirk@opfer-online.de
  S:    Maintained
  
  ARM/PALMTX,PALMT5,PALMLD,PALMTE2,PALMTC SUPPORT
 -P:    Marek Vasut
 -M:    marek.vasut@gmail.com
 +M:    Marek Vasut <marek.vasut@gmail.com>
  L:    linux-arm-kernel@lists.infradead.org
  W:    http://hackndev.com
  S:    Maintained
 +F:    arch/arm/mach-pxa/include/mach/palmtx.h
 +F:    arch/arm/mach-pxa/palmtx.c
 +F:    arch/arm/mach-pxa/include/mach/palmt5.h
 +F:    arch/arm/mach-pxa/palmt5.c
 +F:    arch/arm/mach-pxa/include/mach/palmld.h
 +F:    arch/arm/mach-pxa/palmld.c
 +F:    arch/arm/mach-pxa/include/mach/palmte2.h
 +F:    arch/arm/mach-pxa/palmte2.c
 +F:    arch/arm/mach-pxa/include/mach/palmtc.h
 +F:    arch/arm/mach-pxa/palmtc.c
  
  ARM/PALM TREO 680 SUPPORT
  M:    Tomas Cech <sleep_walker@suse.cz>
  L:    linux-arm-kernel@lists.infradead.org
  W:    http://hackndev.com
  S:    Maintained
 +F:    arch/arm/mach-pxa/include/mach/treo680.h
 +F:    arch/arm/mach-pxa/treo680.c
  
  ARM/PALMZ72 SUPPORT
  M:    Sergey Lapin <slapin@ossfans.org>
  L:    linux-arm-kernel@lists.infradead.org
  W:    http://hackndev.com
  S:    Maintained
 +F:    arch/arm/mach-pxa/include/mach/palmz72.h
 +F:    arch/arm/mach-pxa/palmz72.c
  
  ARM/PLEB SUPPORT
  M:    Peter Chubb <pleb@gelato.unsw.edu.au>
@@@ -2702,7 -2682,7 +2702,7 @@@ F:      include/linux/intel-iommu.
  
  INTEL IOP-ADMA DMA DRIVER
  M:    Dan Williams <dan.j.williams@intel.com>
 -S:    Supported
 +S:    Maintained
  F:    drivers/dma/iop-adma.c
  
  INTEL IXP4XX QMGR, NPE, ETHERNET and HSS SUPPORT
@@@ -3973,6 -3953,7 +3973,7 @@@ F:      drivers/block/paride
  PARISC ARCHITECTURE
  M:    Kyle McMartin <kyle@mcmartin.ca>
  M:    Helge Deller <deller@gmx.de>
+ M:    "James E.J. Bottomley" <jejb@parisc-linux.org>
  L:    linux-parisc@vger.kernel.org
  W:    http://www.parisc-linux.org/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6.git