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

[mv-sheeva.git] / Documentation / devicetree / bindings / powerpc / fsl / ssi.txt

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