diff --git a/[refs] b/[refs] index 869ea1d6ae69..cb1682bdee0d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 985af6f70dbb8a33b3af8a7c7df508d924650e37 +refs/heads/master: 4ac13e177904280a2502c27029a72e3fd2957cde diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 069ee3b5c651..4fe6854c57d9 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -3262,6 +3262,17 @@ F: Documentation/input/multi-touch-protocol.txt F: drivers/input/input-mt.c K: \b(ABS|SYN)_MT_ +INTEL C600 SERIES SAS CONTROLLER DRIVER +M: Intel SCU Linux support +M: Dan Williams +M: Dave Jiang +M: Ed Nadolski +L: linux-scsi@vger.kernel.org +T: git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/isci.git +S: Maintained +F: drivers/scsi/isci/ +F: firmware/isci/ + INTEL IDLE DRIVER M: Len Brown L: linux-pm@lists.linux-foundation.org