Merge tag 'please-pull-misc-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux

Pull misc ia64 bits from Tony Luck.

* tag 'please-pull-misc-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
  MAINTAINERS: update SGI & ia64 Altix stuff
  sysctl: Enable IA64 "ignore-unaligned-usertrap" to be used cross-arch

1 files changed, 2 insertions, 9 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 73b7d50c9407..a92f485f5456 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6841,7 +6841,8 @@ S:	Supported
 F:      drivers/net/ethernet/sfc/
 
 SGI GRU DRIVER
-M:      Jack Steiner <steiner@sgi.com>
+M:      Dimitri Sivanich <sivanich@sgi.com>
+M:      Robin Holt <holt@sgi.com>
 S:      Maintained
 F:      drivers/misc/sgi-gru/
 
@@ -7036,14 +7037,6 @@ L:	linux-fbdev@vger.kernel.org
 S:      Maintained
 F:      drivers/video/smscufx.c
 
-SN-IA64 (Itanium) SUB-PLATFORM
-M:      Jes Sorensen <jes@sgi.com>
-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 <g.liakhovetski@gmx.de>
 L:      linux-media@vger.kernel.org