Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

Browse source

Pull tile PCI build fixes from Chris Metcalf:
 "This fixes a couple of issues with the pci_bus.subordinate removal
  from pci-next as it affected the tile architecture.  One commit does
  the bombing for tilegx PCI (added during the merge window, so missed
  the pci-next bombing) and the other commit undoes a buggy part of the
  bombing for tilepro PCI."

* 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
  tilepro pci: fix pci_bus.subordinate bad bombing from b918c62e
  tilegx pci: fix semantic merge conflict with 3527ed81c

...

This commit is contained in:

Linus Torvalds 2012-07-26 13:48:08 -07:00

parent 8ded2bbc18 7f240b7db0

commit 608adca523

2 changed files with 2 additions and 2 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

arch/tile/kernel/pci.c

View file

2

arch/tile/kernel/pci_gx.c

View file