Merge commit 'main-ics-2012.06.04-A5' into HEAD
authorTom Cherry <tcherry@nvidia.com>
Tue, 5 Jun 2012 18:41:56 +0000 (11:41 -0700)
committerTom Cherry <tcherry@nvidia.com>
Tue, 5 Jun 2012 18:41:56 +0000 (11:41 -0700)
commitb46bcc0a3da47431f2711c3d63e9507cfab18ecd
tree6b9355395470108f5161840638bf48af0e10f3c1
parent63fb092060747250a0dd305bd11018caebe23d65
parentf61bdbde09605793cfa05f7c59545c62b5e08aa6
Merge commit 'main-ics-2012.06.04-A5' into HEAD

Conflicts:
drivers/media/video/tegra/nvavp/nvavp_dev.c

Change-Id: I7779b0ce58004f80cccf6193148ac49551ce5da5
arch/arm/mach-tegra/Makefile
drivers/media/video/tegra/nvavp/nvavp_dev.c
drivers/usb/otg/tegra-otg.c
drivers/video/tegra/dc/dc.c