diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-23 14:34:24 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-23 14:34:24 -0400 |
commit | defe9104833b5ad309447bbc1fcb8e5981b2d3e1 (patch) | |
tree | c399f17f5b2dfacbf6df399dd1df8b15c7573fbe /MAINTAINERS | |
parent | 95b3692d9c22c659312acb466d0608bf8509f296 (diff) | |
parent | 0634a632f5dea8281ae7c9a96800582ff9eb1475 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
asm-generic: add dummy pgprot_noncached()
lib/checksum.c: fix endianess bug
asm-generic: hook up new system calls
asm-generic: list Arnd as asm-generic maintainer
asm-generic: drop HARDIRQ_BITS definition from hardirq.h
asm-generic: uaccess: fix up local access_ok() usage
asm-generic: uaccess: add missing access_ok() check to strnlen_user()
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 5ef3a16eb140..303129ab4b75 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -2482,6 +2482,14 @@ F: drivers/net/wan/pc300too.c | |||
2482 | F: drivers/net/wan/pci200syn.c | 2482 | F: drivers/net/wan/pci200syn.c |
2483 | F: drivers/net/wan/wanxl* | 2483 | F: drivers/net/wan/wanxl* |
2484 | 2484 | ||
2485 | GENERIC INCLUDE/ASM HEADER FILES | ||
2486 | P: Arnd Bergmann | ||
2487 | M: arnd@arndb.de | ||
2488 | L: linux-arch@vger.kernel.org | ||
2489 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git | ||
2490 | S: Maintained | ||
2491 | F: include/asm-generic | ||
2492 | |||
2485 | GFS2 FILE SYSTEM | 2493 | GFS2 FILE SYSTEM |
2486 | P: Steven Whitehouse | 2494 | P: Steven Whitehouse |
2487 | M: swhiteho@redhat.com | 2495 | M: swhiteho@redhat.com |