diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-24 06:10:12 +0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-24 06:10:12 +0400 |
commit | 474183b188b3c5af45831c71151f819fc70479b8 (patch) | |
tree | 8c82a7d60635fc0d9b0e8d8215e9f2e874f77421 /drivers/pci | |
parent | 47b170af84d18b736bb35932823ec01cfcfe1967 (diff) | |
parent | e9c31b32f1cc6d3aa190119103622fb8e4c257b1 (diff) | |
download | linux-474183b188b3c5af45831c71151f819fc70479b8.tar.xz |
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
Diffstat (limited to 'drivers/pci')
0 files changed, 0 insertions, 0 deletions