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

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

fa5a4b3d45fc3ee3426ec50d0d374418de35bfd2