diff options
| author | Nitin Kumbhar <nkumbhar@nvidia.com> | 2010-12-23 14:58:35 +0530 |
|---|---|---|
| committer | Nitin Kumbhar <nkumbhar@nvidia.com> | 2010-12-23 14:58:35 +0530 |
| commit | 96a476b53360de76f20774122111f031be9ac9c2 (patch) | |
| tree | e603fb33cb93cac7bbcc750bbaea8010a22dcea7 /kernel/fork.c | |
| parent | 8302d262e4801d44fa1b1952e15666256692b7b6 (diff) | |
| parent | 3f29a8834975956ed5590959bfced00cb9bd03ed (diff) | |
merging android-tegra-2.6.36 into git-master/linux-2.6/android-tegra-2.6.36
Conflicts:
arch/arm/mach-tegra/board-ventana-power.c
drivers/mfd/tps6586x.c
Change-Id: Ic8c46d4251d6e71fa2900b7e876f87e256299bc4
Diffstat (limited to 'kernel/fork.c')
0 files changed, 0 insertions, 0 deletions