commit 608adca52305e4d14ca5978f9c62698ca45d3f42
author Linus Torvalds <torvalds@linux-foundation.org> Thu Jul 26 13:48:08 2012 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Thu Jul 26 13:48:08 2012 -0700
tree 34bb35bd95dd579965dda1c0f925d540b112ab57
parent 8ded2bbc1845e19c771eb55209aab166ef011243
parent 7f240b7db0956a426075eca73cc7ddf9fefa22a9

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

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