diff options
| author | Nitin Kumbhar <nkumbhar@nvidia.com> | 2011-02-04 17:08:18 +0530 |
|---|---|---|
| committer | Nitin Kumbhar <nkumbhar@nvidia.com> | 2011-02-04 17:08:18 +0530 |
| commit | b6b1f33f279fcb1c4a751f981153affa6469e94c (patch) | |
| tree | a77ace4c91f29d814982c40bea8c4a172af9ee3e /include/linux/zorro.h | |
| parent | df4a2fbff8471de3f75d55b93e2bf94dfd26ff7e (diff) | |
| parent | a979d00287bcd3297bd13a59534073e6faa570c9 (diff) | |
merging android-tegra-2.6.36 into git-master/linux-2.6/android-tegra-2.6.36
Conflicts:
arch/arm/mach-tegra/include/mach/dc.h
drivers/video/tegra/dc/hdmi.c
drivers/video/tegra/host/nvhost_acm.c
Change-Id: Iddf74984cc02f08dca3738967c0580ba7c375337
Diffstat (limited to 'include/linux/zorro.h')
0 files changed, 0 insertions, 0 deletions