tree 0f994dd178226552dd0d1820f651820fb699f50d
parent 2802e34590f290173a3f2aa5a4d662ae5373b420
parent 7816fecd03e480ed0b47d674ed772ca0b45e1b5e
parent 69ca06c9454169c4a9303e8834adae9080f94859
author Paul Mundt <lethal@linux-sh.org> 1247274513 +0900
committer Paul Mundt <lethal@linux-sh.org> 1247274513 +0900

Merge branches 'sh/ftrace' and 'sh/stable-updates'