From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 5 Dec 2013 23:37:44 +0000 (-0800)
Subject: Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux... 
X-Git-Tag: firefly_0821_release~176^2~4824
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b52b342d31fecfeab0e2a256dfd84ea84954a8d3;p=firefly-linux-kernel-4.4.55.git

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

Pull arch/tile ftrace bug fix from Chris Metcalf:
 "This fixes a build failure with allyesconfig reported by Fengguang Wu
  and fixed by Tony Lu"

* 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
  ftrace: default to tilegx if ARCH=tile is specified
---

b52b342d31fecfeab0e2a256dfd84ea84954a8d3