From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 3 Nov 2017 17:36:43 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
X-Git-Tag: v4.14-rc8~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=81ca2caefc6db1df942bdf845a2a74a60842d543;p=thirdparty%2Fkernel%2Flinux.git

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

Pull arch/tile fixes from Chris Metcalf:
 "Two one-line bug fixes"

* git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
  arch/tile: Implement ->set_state_oneshot_stopped()
  tile: pass machine size to sparse
---

81ca2caefc6db1df942bdf845a2a74a60842d543