Merge branch 'spi/merge' of git://git.secretlab.ca/git/linux-2.6

[mv-sheeva.git] / Documentation / devicetree / bindings / powerpc / fsl / cpm_qe / cpm / i2c.txt

diff --git a/Documentation/powerpc/dts-bindings/fsl/cpm_qe/cpm/i2c.txt b/Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/cpm/i2c.txt
similarity index 100%
rename from Documentation/powerpc/dts-bindings/fsl/cpm_qe/cpm/i2c.txt
rename to Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/cpm/i2c.txt