diff options
author | Paul Mundt <lethal@linux-sh.org> | 2009-07-11 03:08:33 +0200 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-07-11 03:08:33 +0200 |
commit | f686d8c11c61143b9705ed38d8cd26b0643902a4 (patch) | |
tree | 0f994dd178226552dd0d1820f651820fb699f50d /drivers/video/sh_mobile_lcdcfb.c | |
parent | sh: Clean up linker script using new linker script macros. (diff) | |
parent | sh: Mark __switch_to() as __notrace_funcgraph (diff) | |
parent | Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block (diff) | |
download | linux-f686d8c11c61143b9705ed38d8cd26b0643902a4.tar.xz linux-f686d8c11c61143b9705ed38d8cd26b0643902a4.zip |
Merge branches 'sh/ftrace' and 'sh/stable-updates'