diff options
| author | Nitin Kumbhar <nkumbhar@nvidia.com> | 2011-02-09 16:58:31 +0530 |
|---|---|---|
| committer | Nitin Kumbhar <nkumbhar@nvidia.com> | 2011-02-09 16:58:31 +0530 |
| commit | ae385299e0faf14d8b81de24f3649d096a841744 (patch) | |
| tree | 1b22c7c02ade387b49dae505fe2b2164e24b7232 /sound | |
| parent | 49111eb5b680a9f2e2ea196ffaf7dd80a7f02e93 (diff) | |
| parent | e51ab3740df4c2880507045f999c4bde3563c6a2 (diff) | |
merging android-tegra-2.6.36 into git-master/linux-2.6/android-tegra-2.6.36
Conflicts:
drivers/video/tegra/dc/hdmi.c
Change-Id: Ia65c693bf49160e3906df68403129ba1e5545912
Diffstat (limited to 'sound')
0 files changed, 0 insertions, 0 deletions