diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-29 14:00:43 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-29 14:00:43 -0400 |
commit | 67e17c1100d741469ce22c09ba98b55fc2aaad50 (patch) | |
tree | d2a8d204960cd75d5beccac417a4de39cd23400a /MAINTAINERS | |
parent | 09a9f1d27892255cfb9c91203f19476765e2d8d1 (diff) | |
parent | 367f3fcd9296977bc4689546f55c5f4a9c680e8d (diff) |
Merge branch 'for-curr' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc
Pull arc architecture fixes from Vineet Gupta:
"This includes fix for a serious bug in DMA mapping API, make
allyesconfig wreckage, removal of bogus email-list placeholder in
MAINTAINERS, a typo in ptrace helper code and last remaining changes
for syscall ABI v3 which we are finally starting to transition-to
internally.
The request is late than I intended to - but I was held up with
debugging a timer link list corruption, for which a proposed fix to
generic timer code was sent out to lkml/tglx earlier today."
* 'for-curr' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
ARC: Fix the typo in event identifier flags used by ptrace
arc: fix dma_address assignment during dma_map_sg()
ARC: Remove SET_PERSONALITY (tracks cross-arch change)
ARC: ABIv3: fork/vfork wrappers not needed in "no-legacy-syscall" ABI
ARC: ABIv3: Print the correct ABI ver
ARC: make allyesconfig build breakages
ARC: MAINTAINERS update for ARC
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 72b08438d536..44135e3d7410 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -7706,9 +7706,10 @@ F: include/linux/swiotlb.h | |||
7706 | 7706 | ||
7707 | SYNOPSYS ARC ARCHITECTURE | 7707 | SYNOPSYS ARC ARCHITECTURE |
7708 | M: Vineet Gupta <vgupta@synopsys.com> | 7708 | M: Vineet Gupta <vgupta@synopsys.com> |
7709 | L: linux-snps-arc@vger.kernel.org | ||
7710 | S: Supported | 7709 | S: Supported |
7711 | F: arch/arc/ | 7710 | F: arch/arc/ |
7711 | F: Documentation/devicetree/bindings/arc/ | ||
7712 | F: drivers/tty/serial/arc-uart.c | ||
7712 | 7713 | ||
7713 | SYSV FILESYSTEM | 7714 | SYSV FILESYSTEM |
7714 | M: Christoph Hellwig <hch@infradead.org> | 7715 | M: Christoph Hellwig <hch@infradead.org> |