aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-10-08 07:40:19 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-10-08 07:40:19 -0700
commit385c51d6b1dc7cdbbb1b189d18bb4680d0714a37 (patch)
tree36ff86c2e8278edc9b54ce1199094f8db7fb23fa /MAINTAINERS
parentd82e23dcaeb083e520fd1ec87d014d0c4a31d79c (diff)
parent4ef8774cb45c3cf78c7a2d7a1a42f6aee7eda3b2 (diff)
downloadkernel_samsung_espresso10-385c51d6b1dc7cdbbb1b189d18bb4680d0714a37.zip
kernel_samsung_espresso10-385c51d6b1dc7cdbbb1b189d18bb4680d0714a37.tar.gz
kernel_samsung_espresso10-385c51d6b1dc7cdbbb1b189d18bb4680d0714a37.tar.bz2
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
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS1
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 09a2028..571900e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3973,6 +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