| author | Tero Kristo <t-kristo@ti.com> | |
| Wed, 29 May 2013 13:18:10 +0000 (16:18 +0300) | ||
| committer | Tero Kristo <t-kristo@ti.com> | |
| Wed, 29 May 2013 13:18:10 +0000 (16:18 +0300) |
Conflicts:
arch/arm/mach-omap2/dpll3xxx.c
Signed-off-by: Tero Kristo <t-kristo@ti.com>
arch/arm/mach-omap2/dpll3xxx.c
Signed-off-by: Tero Kristo <t-kristo@ti.com>
| 1 | 2 | |||
|---|---|---|---|---|
| arch/arm/boot/dts/dra7.dtsi | patch | | diff1 | | diff2 | | blob | history |
| arch/arm/mach-omap2/cclock7xx_data.c | patch | | diff1 | | diff2 | | blob | history |
| arch/arm/mach-omap2/dpll3xxx.c | patch | | diff1 | | diff2 | | blob | history |
| arch/arm/mach-omap2/io.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc arch/arm/boot/dts/dra7.dtsi
Simple merge
diff --cc arch/arm/mach-omap2/cclock7xx_data.c
Simple merge
diff --cc arch/arm/mach-omap2/dpll3xxx.c
Simple merge
diff --cc arch/arm/mach-omap2/io.c
Simple merge