]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 47fcb6d bb15d8d)
Merge branch 'topic/sebastian-devinit-fixups' into next
authorBjorn Helgaas <bhelgaas@google.com>
Mon, 18 Jun 2012 18:14:10 +0000 (12:14 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Mon, 18 Jun 2012 18:14:10 +0000 (12:14 -0600)
* topic/sebastian-devinit-fixups:
  scripts/modpost: check for bad references in .pci.fixups area
  sh/PCI: move fixup hooks from __init to __devinit
  powerpc/PCI: move fixup hooks from __init to __devinit
  frv/PCI: move fixup hooks from __init to __devinit
  arm/PCI: move fixup hooks from __init to __devinit
  alpha/PCI: move fixup hooks from __init to __devinit
  PCI: move fixup hooks from __init to __devinit
  x86/PCI: move fixup hooks from __init to __devinit

1  2 
arch/alpha/kernel/pci.c patch | diff1 | diff2 | blob | history
arch/arm/kernel/bios32.c patch | diff1 | diff2 | blob | history
drivers/pci/quirks.c patch | diff1 | diff2 | blob | history

diff --cc arch/alpha/kernel/pci.c
Simple merge
diff --cc arch/arm/kernel/bios32.c
Simple merge
diff --cc drivers/pci/quirks.c
Simple merge
local clone of linux.git