diff --git a/[refs] b/[refs] index adba47e77aee..73b2dfd2b939 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b6fca72536fb94098acb23c00b4e65d3bc4bb252 +refs/heads/master: cc883afcc02e1c9c8ab64d20f0288355b857f966 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index fa309ab7ccbf..0526e212bed0 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -6768,7 +6768,8 @@ S: Supported F: drivers/net/ethernet/sfc/ SGI GRU DRIVER -M: Jack Steiner +M: Dimitri Sivanich +M: Robin Holt S: Maintained F: drivers/misc/sgi-gru/ @@ -6963,14 +6964,6 @@ L: linux-fbdev@vger.kernel.org S: Maintained F: drivers/video/smscufx.c -SN-IA64 (Itanium) SUB-PLATFORM -M: Jes Sorensen -L: linux-altix@sgi.com -L: linux-ia64@vger.kernel.org -W: http://www.sgi.com/altix -S: Maintained -F: arch/ia64/sn/ - SOC-CAMERA V4L2 SUBSYSTEM M: Guennadi Liakhovetski L: linux-media@vger.kernel.org