Merge remote branch 'remotes/experimental/dev/android-t114-3.4-rebased' into k3.4
authorBo Yan <byan@nvidia.com>
Mon, 2 Jul 2012 21:18:30 +0000 (14:18 -0700)
committerDan Willemsen <dwillemsen@nvidia.com>
Sat, 14 Sep 2013 19:12:16 +0000 (12:12 -0700)
commit954098e68e2ccc553fb7eff708bbc5690ff32d37
tree833bece3bfac528c345c3b91e412ae12472d079a
parent8be2c66fdf0d0805b8aa4f4e6b715858936e1d3b
Merge remote branch 'remotes/experimental/dev/android-t114-3.4-rebased' into k3.4

Conflicts:
arch/arm/mach-tegra/devices.c
arch/arm/mach-tegra/dvfs.h
arch/arm/mach-tegra/timer.c

Change-Id: Ie967f1d45f50601f3c1fad958405d5343e722687

Rebase-Id: R8bded2bd20be11b5c206dd740395c08aed5cf1f8
arch/arm/mach-tegra/clock.c