projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d1c3ed6 3ecd9d0)
Merge branch 'pci/misc' into next
authorBjorn Helgaas <bhelgaas@google.com>
Wed, 9 Jan 2013 18:37:01 +0000 (11:37 -0700)
committerBjorn Helgaas <bhelgaas@google.com>
Wed, 9 Jan 2013 18:37:01 +0000 (11:37 -0700)
* pci/misc:
  PCI: cpqphp: Cleanup and remove unreachable paths
  PCI: Drop "__" prefix on __pci_enable_device_flags()
  PCI: Use "unsigned long" for __pci_enable_device_flags to match ioport.h
  mn10300/PCI: Remove unused pci_root_bus
  frv/PCI: Remove unused pci_root_bus
  x86/PCI: Remove unused pci_root_bus


Trivial merge
ep93xx device tree rework repo: git://git.maquefel.me/linux.git