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

diff --cc arch/sh/Kconfig
index 46d1a5e71f77fb47548180aa0fe8849ca596edd5,6d110a4f7f65580eead807c846aa0894b1fb054a,e2bdd7b94fd916cd4307ff5d53f841feb8e17c80..120bd31a46ea6339f9f8b0f77c1a25b8c2e79fc1
--- 1/arch/sh/Kconfig
--- 2/arch/sh/Kconfig
--- 3/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@@@ -32,8 -31,9 -31,6 +32,9 @@@@ config SUPERH3
        select HAVE_FUNCTION_TRACER
        select HAVE_FTRACE_MCOUNT_RECORD
        select HAVE_DYNAMIC_FTRACE
  +     select HAVE_FUNCTION_TRACE_MCOUNT_TEST
  +     select HAVE_FTRACE_SYSCALLS
+ +     select HAVE_FUNCTION_GRAPH_TRACER
        select HAVE_ARCH_KGDB
        select ARCH_HIBERNATION_POSSIBLE if MMU
   

diff --cc arch/sh/include/asm/thread_info.h
Simple merge

diff --cc drivers/video/sh_mobile_lcdcfb.c
index 65806ec3313b81dee49e7d37596809456750a7d2,da983b720f080dba756dcd48860359412c6121e5,8f24564f77b05e9939b964bfd97862f5078a73cf..98fb82f1161145b17cbf0bae4b7c08d35621c286
--- 1/drivers/video/sh_mobile_lcdcfb.c
--- 2/drivers/video/sh_mobile_lcdcfb.c
--- 3/drivers/video/sh_mobile_lcdcfb.c
+++ b/drivers/video/sh_mobile_lcdcfb.c
@@@@ -920,8 -932,9 -939,10 +927,9 @@@@ static int sh_mobile_lcdc_remove(struc
                dma_free_coherent(&pdev->dev, info->fix.smem_len,
                                  info->screen_base, priv->ch[i].dma_handle);
                fb_dealloc_cmap(&info->cmap);
++              framebuffer_release(info);
        }
   
 --#ifdef CONFIG_HAVE_CLK
        if (priv->dot_clk)
                clk_put(priv->dot_clk);
        clk_put(priv->clk);