Merge tag 'please-pull-misc-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git...
Linus Torvalds [Fri, 22 Feb 2013 01:55:48 +0000 (17:55 -0800)]
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  2 
MAINTAINERS
arch/ia64/Kconfig
init/Kconfig
kernel/sysctl.c

diff --cc MAINTAINERS
Simple merge
Simple merge
diff --cc init/Kconfig
Simple merge
diff --cc kernel/sysctl.c
Simple merge