Merge remote branch 'origin/android-tegra-nv-3.4' into tot
authorBo Yan <byan@nvidia.com>
Mon, 9 Jul 2012 21:11:09 +0000 (14:11 -0700)
committerBo Yan <byan@nvidia.com>
Mon, 9 Jul 2012 21:11:09 +0000 (14:11 -0700)
commit5056dc8ccaa3cbafad5ae8eaeceec2994da3cfe5
treec3c9f44c314ff2b190eccdff13258bf5df078cc5
parentf092a6eca1da1086c4b4a2a6893b53d1997dc58d
parente69322319507d5d3f916498fe326499d4f5d46b3
Merge remote branch 'origin/android-tegra-nv-3.4' into tot

Conflicts:
arch/arm/mach-imx/hotplug.c

Change-Id: I33c5f2e4c2d556c09173be3c5fd36bf59f7c9ca8
Makefile
arch/arm/mach-imx/hotplug.c
arch/arm/vfp/vfpmodule.c