From: Paul Mundt <lethal@linux-sh.org>
Date: Mon, 6 Jul 2009 11:19:28 +0000 (+0900)
Subject: Merge branches 'sh/ftrace' and 'sh/cachetlb'
X-Git-Tag: v2.6.32-rc1~640^2~104
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7119888df1fd115573616ae43747b2e823b0663e;p=karo-tx-linux.git

Merge branches 'sh/ftrace' and 'sh/cachetlb'
---

7119888df1fd115573616ae43747b2e823b0663e