Merge branch 'devicetree/arm-next' of git://git.secretlab.ca/git/linux-2.6 into devel...