diff --git a/[refs] b/[refs] index 1ca71cd7c8db..a017bddbe7ef 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ee709b0c62bd163fd3b5aff2320e8724cd8e3d8b +refs/heads/master: a2681a75426552c185b7c594116cc44ef8302aba diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 88dffb461498..8ea20fc88d09 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -4521,12 +4521,11 @@ F: kernel/sched* F: include/linux/sched.h SCORE ARCHITECTURE -P: Chen Liqin -M: liqin.chen@sunplusct.com -P: Lennox Wu -M: lennox.wu@gmail.com +M: Chen Liqin +M: Lennox Wu W: http://www.sunplusct.com S: Supported +F: arch/score/ SCSI CDROM DRIVER M: Jens Axboe