Merge branch 'android-tegra' into android-tegra-moto
authorErik Gilling <konkers@android.com>
Fri, 25 Feb 2011 01:18:22 +0000 (17:18 -0800)
committerErik Gilling <konkers@android.com>
Fri, 25 Feb 2011 01:18:22 +0000 (17:18 -0800)
commit5257d707de2a0cff758a92aa43071b375555dc58
tree90446cb3e132c506b620f4e64edef233e7cbfcdc
parentbba6acdef86e7cfa4656134a7a75048c0aec8309
parent01863b94e7ea138703dbcc3a0e5d49828a5cf4ff
Merge branch 'android-tegra' into android-tegra-moto
arch/arm/mach-tegra/Makefile
arch/arm/mach-tegra/tegra2_clocks.c