Merge tag 'v3.5-rc6' into irqdomain/next

author Grant Likely <grant.likely@secretlab.ca>

Wed, 11 Jul 2012 15:08:35 +0000 (16:08 +0100)

committer Grant Likely <grant.likely@secretlab.ca>

Wed, 11 Jul 2012 15:08:35 +0000 (16:08 +0100)
author Grant Likely <grant.likely@secretlab.ca>
Wed, 11 Jul 2012 15:08:35 +0000 (16:08 +0100)
committer Grant Likely <grant.likely@secretlab.ca>
Wed, 11 Jul 2012 15:08:35 +0000 (16:08 +0100)
diff --cc arch/powerpc/platforms/pseries/iommu.c
Simple merge
diff --cc drivers/of/base.c
Simple merge
author	Grant Likely <grant.likely@secretlab.ca>
	Wed, 11 Jul 2012 15:08:35 +0000 (16:08 +0100)
committer	Grant Likely <grant.likely@secretlab.ca>
	Wed, 11 Jul 2012 15:08:35 +0000 (16:08 +0100)
		1	2
arch/powerpc/platforms/pseries/iommu.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/of/base.c	patch \|	diff1 \|	diff2 \|	blob \| history