diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-06-20 20:17:38 (GMT) |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-06-20 20:17:38 (GMT) |
| commit | 6f9543f158a1068a69cf8ed0ef423f96f38205e0 (patch) | |
| tree | bf49fd924901414c418e5bf643c40e913b4d520a /fs/dlm/member.c | |
| parent | 15f4b11b0fa91cf81738215483b2bb2c0b911285 (diff) | |
| parent | 5f13269130d6798571ffbd9d84dbef0950984c5b (diff) | |
| download | linux-6f9543f158a1068a69cf8ed0ef423f96f38205e0.tar.xz | |
Merge tag 'exynos-dt-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/dt
From Kukjin Kim:
2nd exynos dt update based on tags/exynos-dt-1
- enable RTC on exynos5250 snow and Arndale boards
- add support LCD and PWM for exynos4210 Origen board
- update bootargs to support 8GiB for exynos5440 SSDK5440 and SD5v1 boards
- enable spi and add opp level for exynos5440
- add example doc for samsung-pinctrl dt bindings
* tag 'exynos-dt-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: dts: Set BUCK7 as always on for Origen board
ARM: dts: Add FIMD node to Origen4210 board
ARM: dts: Add LCD related pinctrl entries for exynos4210
ARM: dts: Add PWM related pinctrl entries for exynos4210
Documentation: Add examples to samsung-pinctrl device tree bindings documentation
ARM: dts: Enable RTC node for exynos5250-snow
ARM: dts: Enable RTC node for Arndale
ARM: dts: Removing pdma for exynos5440
ARM: dts: update bootargs to support 8GiB for SSDK5440 and SD5v1
ARM: dts: Add more opp levels in exynos5440
ARM: dts: Add wm8994 regulator support on smdk5250
ARM: dts: enable spi for EXYNOS5440 SOC
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'fs/dlm/member.c')
0 files changed, 0 insertions, 0 deletions