summaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-12-06 00:37:44 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2013-12-06 00:37:44 +0100
commitb52b342d31fecfeab0e2a256dfd84ea84954a8d3 (patch)
tree9d8a81ef73f2e019db1618c669463bee3ed32ce2 /block
parentMerge branch 'for-linus' of git://git.kernel.dk/linux-block (diff)
parentftrace: default to tilegx if ARCH=tile is specified (diff)
downloadlinux-b52b342d31fecfeab0e2a256dfd84ea84954a8d3.tar.xz
linux-b52b342d31fecfeab0e2a256dfd84ea84954a8d3.zip
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
Diffstat (limited to 'block')
0 files changed, 0 insertions, 0 deletions