From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 30 May 2014 04:39:27 +0000 (+1000)
Subject: Merge remote-tracking branch 'ftrace/for-next'
X-Git-Tag: next-20140530~32
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2d1c842b1508d6a78d3e1b76fdc4401bf91aa95c;p=karo-tx-linux.git

Merge remote-tracking branch 'ftrace/for-next'
---

2d1c842b1508d6a78d3e1b76fdc4401bf91aa95c