aboutsummaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-09-30 10:38:46 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-09-30 10:38:46 -0700
commit8945546d90a748d1484872c48823f8c8ab302577 (patch)
treefd75abaef58848121cf75506ad8a9ae52b2be390 /MAINTAINERS
parent815a4bb18ba834a58a60da14536ace4dcaa8b465 (diff)
parented38665eb50ef7ad530f9b2db531a09b8520ed32 (diff)
downloadlinux-8945546d90a748d1484872c48823f8c8ab302577.tar.gz
Merge tag 'for-linus-20130929' of git://github.com/sctscore/official-linux
Pull S+core fixes from Lennox Wu: "These updates include updating information of maintainers, fix some trivial errors, and add a necessary function for supporting ipv6" * tag 'for-linus-20130929' of git://github.com/sctscore/official-linux: Score: Update the information of Score maintaners Score: Modify the Makefile of Score, remove -mlong-calls for compiling Score: Implement the function csum_ipv6_magic Score: The commit is for compiling successfully
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS4
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 284969fa289..d2d2f457dcd 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7271,9 +7271,9 @@ F: include/linux/sched.h
F: include/uapi/linux/sched.h
SCORE ARCHITECTURE
-M: Chen Liqin <liqin.chen@sunplusct.com>
+M: Chen Liqin <liqin.linux@gmail.com>
M: Lennox Wu <lennox.wu@gmail.com>
-W: http://www.sunplusct.com
+W: http://www.sunplus.com
S: Supported
F: arch/score/