Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux-2.6