From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 24 Sep 2012 23:17:17 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=56d27adcb536b7430d5f8a6240df8ad261eb00bd;p=linux-beck.git

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
---

56d27adcb536b7430d5f8a6240df8ad261eb00bd