Merge remote-tracking branch 'tegra/for-next'

author Stephen Rothwell <sfr@canb.auug.org.au>

Thu, 25 Oct 2012 02:41:03 +0000 (13:41 +1100)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Thu, 25 Oct 2012 02:41:03 +0000 (13:41 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 25 Oct 2012 02:41:03 +0000 (13:41 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 25 Oct 2012 02:41:03 +0000 (13:41 +1100)
diff --cc arch/arm/Kconfig
Simple merge
diff --cc drivers/crypto/tegra-aes.c
Simple merge
diff --cc drivers/iommu/tegra-smmu.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 25 Oct 2012 02:41:03 +0000 (13:41 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 25 Oct 2012 02:41:03 +0000 (13:41 +1100)
		1	2
arch/arm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/crypto/tegra-aes.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/iommu/tegra-smmu.c	patch \|	diff1 \|	diff2 \|	blob \| history