diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2012-09-22 12:11:21 +0900 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-09-22 12:11:21 +0900 |
| commit | 56952baa9b6f6bc06437abd51baefc4f7c8dee3b (patch) | |
| tree | da0ddfda65137a591a695a0648ee8160922f8eb6 /tools/perf/scripts/python/bin | |
| parent | Linux 3.6-rc6 (diff) | |
| parent | ARM: EXYNOS: Enable pinctrl driver support for EXYNOS4 device tree enabled pl... (diff) | |
| parent | ARM: EXYNOS: Add generic PWM lookup support for SMDKV310 (diff) | |
| download | linux-56952baa9b6f6bc06437abd51baefc4f7c8dee3b.tar.gz linux-56952baa9b6f6bc06437abd51baefc4f7c8dee3b.zip | |
Merge branches 'next/pinctrl-samsung' and 'next/board-samsung' into next/dt-samsung-new
Conflicts:
arch/arm/mach-exynos/mach-smdkv310.c