Merge tag 'v3.5-rc6' into irqdomain/next
authorGrant Likely <grant.likely@secretlab.ca>
Wed, 11 Jul 2012 15:08:35 +0000 (16:08 +0100)
committerGrant Likely <grant.likely@secretlab.ca>
Wed, 11 Jul 2012 15:08:35 +0000 (16:08 +0100)
Linux 3.5-rc6

1  2 
arch/powerpc/platforms/pseries/iommu.c
drivers/of/base.c

Simple merge