Merge remote-tracking branch 'origin/dev/k3.3-rc1-iommu' into android-tegra-nv-3.1
authorRohan Somvanshi <rsomvanshi@nvidia.com>
Wed, 1 Feb 2012 10:33:06 +0000 (15:33 +0530)
committerRohan Somvanshi <rsomvanshi@nvidia.com>
Wed, 1 Feb 2012 10:33:06 +0000 (15:33 +0530)
commit13ab2df1dfed5153899b98b1417f52de0ecc70cd
tree9b47b72d23fef02d1b489a845547106430552be9
parentc8932c9184978b42398fd582592315cbbf507415
parentac2b520c46800dec16f3c23d0cf8759826750937
Merge remote-tracking branch 'origin/dev/k3.3-rc1-iommu' into android-tegra-nv-3.1

Change-Id: I9001bb291779f107bbcb593d48f9f0f734074d0e
drivers/iommu/Kconfig
drivers/iommu/Makefile