diff --git a/[refs] b/[refs] index c659e80f9561..8e050eb7ccf3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6bc9a3966f0395419b09b2ec90f89f7f00341b37 +refs/heads/master: 6bcf67374137f433e85aa42a18fde9f0e8562901 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 035df9d26609..ef643ddd5e8d 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -5000,6 +5000,14 @@ S: Maintained F: kernel/sched* F: include/linux/sched.h +SCORE ARCHITECTURE +P: Chen Liqin +M: liqin.chen@sunplusct.com +P: Lennox Wu +M: lennox.wu@sunplusct.com +W: http://www.sunplusct.com +S: Supported + SCSI CDROM DRIVER P: Jens Axboe M: axboe@kernel.dk