6c6d62ae05a125602ea8e5bc7
parent e70cf54073acb6494620620af2ab993d57ae8d3f
author Linus Torvalds <torvalds@linux-foundation.org> 1348528637 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1348528637 -0700

Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

Pull tile gxio ABI fix from Chris Metcalf:
 "This fixes a last-minute change in the Tilera hypervisor ABI for TRIO
  (PCI root complex) support.  We've locked in this ABI going forward
  and will make sure no further ABI changes like this occur."

* git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
  tile: gxio iorpc numbering change for TRIO interface