]> Gitweb @ Texas Instruments - Open Source Git Repositories - git.TI.com/gitweb - android-sdk/kernel-video.git/commit
Merge remote-tracking branch 'rnayak/platform-base-3.8.y' into pm-linux-3.8.y
authorTero Kristo <t-kristo@ti.com>
Wed, 29 May 2013 13:18:10 +0000 (16:18 +0300)
committerTero Kristo <t-kristo@ti.com>
Wed, 29 May 2013 13:18:10 +0000 (16:18 +0300)
commit1215e6de72cc5a4a6129652a9f87f13ce1c97401
treeca64b397433db8d36e43ecbb83fb3721207e2d14
parent0dd281e2969006a574175b03f3886a8246e6b023
parentbc5bdd08bbeb221e83daccc85970d0c122a9a0e9
Merge remote-tracking branch 'rnayak/platform-base-3.8.y' into pm-linux-3.8.y

Conflicts:
arch/arm/mach-omap2/dpll3xxx.c

Signed-off-by: Tero Kristo <t-kristo@ti.com>
arch/arm/boot/dts/dra7.dtsi
arch/arm/mach-omap2/cclock7xx_data.c
arch/arm/mach-omap2/dpll3xxx.c
arch/arm/mach-omap2/io.c