projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 47b170a e9c31b3)
Merge tag 'please-pull-misc-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 24 Jul 2012 02:10:12 +0000 (19:10 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 24 Jul 2012 02:10:12 +0000 (19:10 -0700)
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

1  2 
lib/Kconfig.debug patch | diff1 | diff2 | blob | history

diff --cc lib/Kconfig.debug
Simple merge
Linux Kernel tree with some unpolished code for Colibri/Apalis modules