tree 9d8a81ef73f2e019db1618c669463bee3ed32ce2
parent 5ee540613db504a10e15fafaf4c08cac96aa1823
parent 2d8eedad9233d4771fb3134f50e5c5a09e28352c
author Linus Torvalds <torvalds@linux-foundation.org> 1386286664 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1386286664 -0800

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