aboutsummaryrefslogtreecommitdiff
path: root/kernel/trace/trace_functions_graph.c
diff options
context:
space:
mode:
authorGravatar Linus Torvalds <torvalds@linux-foundation.org> 2015-04-22 11:26:00 -0700
committerGravatar Linus Torvalds <torvalds@linux-foundation.org> 2015-04-22 11:26:00 -0700
commit9b60afee50425064fa0a69bea22f07b6ea55ebc1 (patch)
tree7e570ffc883dc4517c6d01bb7445480ba294494e /kernel/trace/trace_functions_graph.c
parentMerge git://www.linux-watchdog.org/linux-watchdog (diff)
parentia64/PCI: Treat all host bridge Address Space Descriptors (even consumers) as... (diff)
downloadlinux-9b60afee50425064fa0a69bea22f07b6ea55ebc1.tar.gz
linux-9b60afee50425064fa0a69bea22f07b6ea55ebc1.tar.bz2
linux-9b60afee50425064fa0a69bea22f07b6ea55ebc1.zip
Merge tag 'pci-v4.1-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull PCI fixes from Bjorn Helgaas: "These fix an ia64 regression caused by tighter resource checking we merged during the merge window and remove an invalid email address from MAINTAINERS. Resource management: - ia64: Treat all Address Space Descriptors as windows (Bjorn Helgaas) Miscellaneous: - MAINTAINERS: Remove Mohit Kumar (email bounces) (Bjorn Helgaas)" * tag 'pci-v4.1-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: ia64/PCI: Treat all host bridge Address Space Descriptors (even consumers) as windows MAINTAINERS: Remove Mohit Kumar (email bounces)
Diffstat (limited to 'kernel/trace/trace_functions_graph.c')
0 files changed, 0 insertions, 0 deletions