]> rtime.felk.cvut.cz Git - can-eth-gw-linux.git/commit
Merge branch 'next/devel-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorOlof Johansson <olof@lixom.net>
Sat, 22 Sep 2012 06:00:41 +0000 (23:00 -0700)
committerOlof Johansson <olof@lixom.net>
Sat, 22 Sep 2012 06:00:41 +0000 (23:00 -0700)
commit8437de04d1475ee4af43a217ac2ca74eb9f58ad1
treeb8481a64ea0bcb0a6b2f8d27f0c26e39726f0a03
parent3aec092eed5d8d2b19a62b0aeed3acea9471099a
parent13acc291191281e2980e56dbe3a3d80ce677c9a8
Merge branch 'next/devel-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/soc

Misc SoC-related fixes/cleanups for Samsung platforms

* 'next/devel-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: SAMSUNG: Add check for NULL in clock interface
  ARM: EXYNOS: Put PCM, Slimbus, Spdif clocks to off state
  ARM: EXYNOS: Add bus clock for FIMD
  ARM: SAMSUNG: Fix HDMI related warnings
  ARM: S3C24XX: Add .get_rate callback for "camif-upll" clock
  ARM: EXYNOS: Fix incorrect help text
  ARM: EXYNOS: Turn off clocks for NAND, OneNAND and TSI controllers
  + sync to 3.6-rc6
15 files changed:
MAINTAINERS
arch/arm/Makefile
arch/arm/mach-imx/clk-imx35.c
arch/arm/mach-omap2/Makefile
arch/arm/mach-omap2/clock33xx_data.c
arch/arm/mach-omap2/omap-wakeupgen.c
arch/arm/mach-omap2/omap_hwmod.c
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
arch/arm/mach-omap2/omap_hwmod_44xx_data.c
arch/arm/mach-omap2/timer.c
arch/arm/plat-omap/sram.c
arch/arm/plat-samsung/devs.c
drivers/tty/serial/imx.c
drivers/usb/gadget/u_serial.c
drivers/usb/serial/ftdi_sio.c