summary refs log tree commit diff
path: root/drivers/tty
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2012-09-13 09:08:02 -0600
committerBjorn Helgaas <bhelgaas@google.com>2012-09-13 09:08:02 -0600
commit6dabee73d46bfafb8c588b21b14606914de97ee6 (patch)
tree140f679ec718d022e9946d8534af5cd7646340c6 /drivers/tty
parent78890b5989d96ddce989cde929c45ceeded0fcaf (diff)
parent769ae543dc8d5745e1ade88cbcf1271a96276fd2 (diff)
downloadlinux-6dabee73d46bfafb8c588b21b14606914de97ee6.tar.gz
Merge branch 'pci/trivial' into next
* pci/trivial:
  PCI: Drop duplicate const in DECLARE_PCI_FIXUP_SECTION
  PCI: Drop bogus default from ARCH_SUPPORTS_MSI
  PCI: cpqphp: Remove unreachable path
  PCI: Remove bus number resource debug messages
  PCI/AER: Print completion message at KERN_INFO to match starting message
  PCI: Fix drivers/pci/pci.c kernel-doc warnings
Diffstat (limited to 'drivers/tty')
0 files changed, 0 insertions, 0 deletions