aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2009-07-11 10:08:33 +0900
committerPaul Mundt <lethal@linux-sh.org>2009-07-11 10:08:33 +0900
commitf686d8c11c61143b9705ed38d8cd26b0643902a4 (patch)
tree0f994dd178226552dd0d1820f651820fb699f50d
parent2802e34590f290173a3f2aa5a4d662ae5373b420 (diff)
parent7816fecd03e480ed0b47d674ed772ca0b45e1b5e (diff)
parent69ca06c9454169c4a9303e8834adae9080f94859 (diff)
Merge branches 'sh/ftrace' and 'sh/stable-updates'