| author | Dan Murphy <dmurphy@ti.com> | |
| Wed, 24 Apr 2013 17:49:48 +0000 (12:49 -0500) | ||
| committer | Dan Murphy <dmurphy@ti.com> | |
| Wed, 24 Apr 2013 17:49:48 +0000 (12:49 -0500) |
Conflicts:
arch/arm/boot/dts/omap4-panda.dts
Signed-off-by: Dan Murphy <dmurphy@ti.com>
arch/arm/boot/dts/omap4-panda.dts
Signed-off-by: Dan Murphy <dmurphy@ti.com>
| 1 | 2 | |||
|---|---|---|---|---|
| arch/arm/Kconfig | patch | | diff1 | | diff2 | | blob | history |
| arch/arm/boot/dts/omap4-panda-es.dts | patch | | diff1 | | diff2 | | blob | history |
| arch/arm/mach-omap2/cclock54xx_data.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/arm/boot/dts/omap4-panda-es.dts
Simple merge
diff --cc arch/arm/mach-omap2/cclock54xx_data.c
Simple merge