summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'pci/jiang-remove-global-list' into nextBjorn Helgaas2013-06-032-59/+36
|\
| * PCI/ACPI: Use dev_printk(), acpi_handle_print(), pr_xxx() when possibleJiang Liu2013-05-291-32/+27
| * PCI/ACPI: Remove unused global list acpi_pci_rootsJiang Liu2013-05-292-19/+1
| * PCI/ACPI: Introduce "handle" local for economy of expressionJiang Liu2013-05-291-5/+6
| * PCI/ACPI: Combine duplicate adjacent "if" testsJiang Liu2013-05-291-3/+2
* | Merge branch 'pci/misc' into nextBjorn Helgaas2013-06-027-34/+25
|\ \
| * | PCI: Replace strict_strtoul() with kstrtoul()Jingoo Han2013-06-021-9/+9
| * | PCI: Fix comment typo for PCI_EXP_LNKCAP_CLKPMYijing Wang2013-05-291-1/+1
| * | PCI: Replace printks with appropriate pr_*()Yijing Wang2013-05-281-2/+2
| * | PCI: Fix kerneldoc for pci_disable_link_state()Yijing Wang2013-05-281-4/+9
| * | x86/PCI: Increase info->res_num before checking pci_use_crsYijing Wang2013-05-281-5/+2
| * | PCI: Fix INTC comment typo for pci_swizzle_interrupt_pin()Wang Sheng-Hui2013-05-281-1/+1
| * | PCI: Convert ioapic.c to module_pci_driverLibo Chen2013-05-281-12/+1
* | | Merge branch 'pci/kevin-bus-to-resource' into nextBjorn Helgaas2013-05-261-6/+25
|\ \ \
| * | | PCI: Unset resource if initial BAR value is invalidKevin Hao2013-05-251-1/+21
| * | | PCI: Consolidate calls to pcibios_bus_to_resource() in __pci_read_base()Kevin Hao2013-05-251-3/+2
| * | | PCI: Add 0x prefix to BAR register position in __pci_read_base()Kevin Hao2013-05-251-2/+2
| | |/ | |/|
* | | Merge branch 'pci/misc' into nextBjorn Helgaas2013-05-215-9/+43
|\ \ \ | |/ / |/| / | |/
| * PCI/ASPM: Warn when driver asks to disable ASPM, but we can't do itBjorn Helgaas2013-05-211-3/+13
| * sparc/PCI: Use PCI_UNKNOWN for unknown power stateBjorn Helgaas2013-05-211-1/+1
| * powerpc/PCI: Use PCI_UNKNOWN for unknown power stateBjorn Helgaas2013-05-171-1/+1
| * PCI/ACPI: Check acpi_resource_to_address64() return valueBjorn Helgaas2013-05-151-4/+3
| * PCI: Work around Ivytown NTB BAR size issueJon Mason2013-05-151-0/+25
|/
* Linux 3.10-rc1v3.10-rc1Linus Torvalds2013-05-121-2/+2
* Merge tag 'trace-fixes-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2013-05-126-108/+368
|\
| * tracing/kprobes: Support soft-mode disablingMasami Hiramatsu2013-05-101-0/+6
| * tracing/kprobes: Support ftrace_event_file base multibufferMasami Hiramatsu2013-05-101-36/+214
| * tracing/kprobes: Pass trace_probe directly from dispatcherMasami Hiramatsu2013-05-101-17/+16
| * tracing/kprobes: Increment probe hit-count even if it is used by perfMasami Hiramatsu2013-05-101-4/+4
| * tracing/kprobes: Use bool for retprobe checkerMasami Hiramatsu2013-05-101-1/+1
| * ftrace: Fix function probe when more than one probe is addedSteven Rostedt (Red Hat)2013-05-101-1/+5
| * ftrace: Fix the output of enabled_functions debug fileSteven Rostedt (Red Hat)2013-05-101-1/+1
| * ftrace: Fix locking in register_ftrace_function_probe()Steven Rostedt (Red Hat)2013-05-101-4/+6
| * tracing: Add helper function trace_create_new_event() to remove duplicate codeSteven Rostedt (Red Hat)2013-05-101-12/+20
| * tracing: Modify soft-mode only if there's no other referrerMasami Hiramatsu2013-05-102-2/+11
| * tracing: Indicate enabled soft-mode in enable fileMasami Hiramatsu2013-05-101-0/+2
| * tracing/kprobes: Fix to increment return event probe hit-countMasami Hiramatsu2013-05-101-0/+2
| * ftrace: Cleanup regex_lock and ftrace_lock around hash updatingMasami Hiramatsu2013-05-101-27/+32
| * ftrace, kprobes: Fix a deadlock on ftrace_regex_lockMasami Hiramatsu2013-05-102-21/+56
| * ftrace: Have ftrace_regex_write() return either read or errorSteven Rostedt (Red Hat)2013-05-091-1/+1
| * tracing: Return error if register_ftrace_function_probe() fails for event_ena...Steven Rostedt (Red Hat)2013-05-091-2/+9
| * tracing: Don't succeed if event_enable_func did not register anythingMasami Hiramatsu2013-05-091-1/+4
| * ring-buffer: Select IRQ_WORKSteven Rostedt (Red Hat)2013-05-041-1/+1
* | Merge tag 'stable/for-linus-3.10-rc0-tag-two' of git://git.kernel.org/pub/scm...Linus Torvalds2013-05-125-7/+55
|\ \
| * | xen/pci: Used cached MSI-X capability offsetBjorn Helgaas2013-05-101-2/+1
| * | xen/pci: Use PCI_MSIX_TABLE_BIR, not PCI_MSIX_FLAGS_BIRMASKBjorn Helgaas2013-05-101-1/+1
| * | xen: clear IRQ_NOAUTOEN and IRQ_NOREQUESTJulien Grall2013-05-081-1/+2
| * | xen: mask x2APIC feature in PVZhenzhong Duan2013-05-081-0/+3
| * | xen: SWIOTLB is only used on x86Arnd Bergmann2013-05-081-1/+1
| * | xen/spinlock: Fix check from greater than to be also be greater or equal to.Konrad Rzeszutek Wilk2013-05-081-1/+1