diff options
author | Olof Johansson <olof@lixom.net> | 2012-09-22 10:00:41 +0400 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-09-22 10:00:41 +0400 |
commit | 8437de04d1475ee4af43a217ac2ca74eb9f58ad1 (patch) | |
tree | b8481a64ea0bcb0a6b2f8d27f0c26e39726f0a03 /MAINTAINERS | |
parent | 3aec092eed5d8d2b19a62b0aeed3acea9471099a (diff) | |
parent | 13acc291191281e2980e56dbe3a3d80ce677c9a8 (diff) | |
download | linux-8437de04d1475ee4af43a217ac2ca74eb9f58ad1.tar.xz |
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
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index bc7dd64b2c60..9d3965cbf48c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3397,7 +3397,7 @@ M: "Wolfram Sang (embedded platforms)" <w.sang@pengutronix.de> L: linux-i2c@vger.kernel.org W: http://i2c.wiki.kernel.org/ T: quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-i2c/ -T: git git://git.fluff.org/bjdooks/linux.git +T: git git://git.pengutronix.de/git/wsa/linux.git S: Maintained F: Documentation/i2c/ F: drivers/i2c/ |