From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 26 Jul 2012 20:48:08 +0000 (-0700)
Subject: Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux... 
X-Git-Tag: v3.6-rc1~87
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=608adca52305e4d14ca5978f9c62698ca45d3f42;p=platform%2Fkernel%2Flinux-3.10.git

Merge branch 'stable' of git://git./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
---

608adca52305e4d14ca5978f9c62698ca45d3f42