commit | 474183b188b3c5af45831c71151f819fc70479b8 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jul 23 19:10:12 2012 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jul 23 19:10:12 2012 -0700 |
tree | 8c82a7d60635fc0d9b0e8d8215e9f2e874f77421 | |
parent | 47b170af84d18b736bb35932823ec01cfcfe1967 [diff] | |
parent | e9c31b32f1cc6d3aa190119103622fb8e4c257b1 [diff] |
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