Merge remote branch 'origin/android-tegra-nv-3.1' into HEAD
Tom Cherry [Fri, 8 Jun 2012 05:47:04 +0000 (22:47 -0700)]
1  2 
arch/arm/mach-tegra/Makefile
drivers/media/video/tegra/nvavp/nvavp_dev.c
drivers/video/tegra/dc/dc.c

Simple merge
Simple merge