diff options
| author | Nitin Kumbhar <nkumbhar@nvidia.com> | 2011-04-25 14:42:58 +0530 |
|---|---|---|
| committer | Nitin Kumbhar <nkumbhar@nvidia.com> | 2011-04-25 14:42:58 +0530 |
| commit | ed22062df7ae836e674c01f69e8567ad51ba31b1 (patch) | |
| tree | 32972feea81e770d650a3dc7d36907a7c49f9d4d /arch/arm/plat-omap | |
| parent | 90651aad036485974b99101df66a50e57c19e732 (diff) | |
| parent | 2e35e1d7b965893e68f2fb1af77129406be5ff05 (diff) | |
merging android-tegra-2.6.36 into git-master/linux-2.6/android-tegra-2.6.36
Conflicts:
arch/arm/mm/proc-v7.S
drivers/video/tegra/dc/dc.c
Change-Id: I40be0d615f14f1c01305388a706d257f624ba968
Diffstat (limited to 'arch/arm/plat-omap')
0 files changed, 0 insertions, 0 deletions