From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 24 Jul 2012 02:10:12 +0000 (-0700)
Subject: Merge tag 'please-pull-misc-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: next-20120725~121
X-Git-Url: https://git.karo-electronics.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=474183b188b3c5af45831c71151f819fc70479b8

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

Pull misc Itanium fixes from Tony Luck.

* tag 'please-pull-misc-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
  debug: Do not permit CONFIG_DEBUG_STACK_USAGE=y on IA64 or PARISC
  [IA64] Port OOM changes to ia64_do_page_fault
---

474183b188b3c5af45831c71151f819fc70479b8