summaryrefslogtreecommitdiffstats
path: root/drivers/clk/clk-nomadik.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-09-14 23:54:29 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2012-09-14 23:54:29 +0200
commitfe59d297eaf59d3f9b4c161b9d17ff16250b6c9e (patch)
tree84fc17b36bbc732b6e236fc5398d1669c3c1f138 /drivers/clk/clk-nomadik.c
parentMerge tag 'staging-3.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff)
parenttty: serial: imx: don't reinit clock in imx_setup_ufcr() (diff)
downloadlinux-fe59d297eaf59d3f9b4c161b9d17ff16250b6c9e.tar.xz
linux-fe59d297eaf59d3f9b4c161b9d17ff16250b6c9e.zip
Merge tag 'tty-3.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
Pull TTY fixes from Greg Kroah-Hartman: "Here are 2 tiny patches for a serial driver to resolve issues that people have reported with the 3.6-rc tree. Both of these have been in the linux-next tree for a while now. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>" * tag 'tty-3.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: tty: serial: imx: don't reinit clock in imx_setup_ufcr() tty: serial: imx: console write routing is unsafe on SMP
Diffstat (limited to 'drivers/clk/clk-nomadik.c')
0 files changed, 0 insertions, 0 deletions