Merge branch 'devicetree/for-x86' of git://git.secretlab.ca/git/linux-2.6 into x86...