diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-29 18:30:23 (GMT) |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-29 18:30:23 (GMT) |
| commit | 6fd9b70e1b8f5d715728510b8f6e2566101143f1 (patch) | |
| tree | 962e169c8bd1b978a9091633f70544f8ce9ed7c0 /drivers/hwmon/via-cputemp.c | |
| parent | f5142021129e25ef4171b0241c34837d322b9c72 (diff) | |
| parent | 84bd48a04eff487570c9cdd91648835456ed65ac (diff) | |
| download | linux-6fd9b70e1b8f5d715728510b8f6e2566101143f1.tar.xz | |
Merge branch 'next/dt-samsung-new' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/dt2
From Kukjin Kim:
* 'next/dt-samsung-new' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: dts: Add nodes for dw_mmc controllers for Samsung EXYNOS5250 platforms
ARM: EXYNOS: Add AUXDATA support for MSHC controllers
ARM: EXYNOS: Add support for MSHC controller clocks
ARM: dts: Enable on-board keys as wakeup source for exynos4210-origen
ARM: dts: use uart2 for console on smdkv310 and smdk5250
ARM: dts: Add basic dts file for Samsung Trats board
ARM: EXYNOS: Add OF compatibility lookups for EXYNOS4 i2c adapters
ARM: dts: Specify address and size cells for i2c controllers for EXYNOS4
ARM: dts: Assume status of all optional nodes as disabled for exynos4
ARM: EXYNOS: Use exynos4 prefix instead of exynos4210 on exynos4-dt
ARM: dts: Move parts common to EXYNOS4 from exynos4210.dtsi to exynos4.dtsi
Diffstat (limited to 'drivers/hwmon/via-cputemp.c')
0 files changed, 0 insertions, 0 deletions