Merge remote branch 'origin/android-tegra-nv-3.1' into HEAD
authorTom Cherry <tcherry@nvidia.com>
Fri, 8 Jun 2012 05:47:04 +0000 (22:47 -0700)
committerTom Cherry <tcherry@nvidia.com>
Fri, 8 Jun 2012 05:47:04 +0000 (22:47 -0700)
commit94596e0f2e5485acce0d6eef11799c5c35610cd5
tree8b53e2a7700aad78e278288f5aed6d95f514bc23
parent7ca2a5f1d750b580f5093c2c6895772b32d30f66
parentb17f01f41b5cd2a49e48b87fb51d59c181819d89
Merge remote branch 'origin/android-tegra-nv-3.1' into HEAD
arch/arm/mach-tegra/Makefile
drivers/media/video/tegra/nvavp/nvavp_dev.c
drivers/video/tegra/dc/dc.c