summaryrefslogtreecommitdiffstats
path: root/Documentation/devicetree/bindings/mmc/mmc-spi-slot.txt
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-07-18 06:22:45 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-07-18 06:22:45 -0700
commit5b1f6d81e4c63ae30d92678cc35081001add7674 (patch)
tree8980816357cfe8df56ca9735da73b75c1ed6d235 /Documentation/devicetree/bindings/mmc/mmc-spi-slot.txt
parent8397c76a2c209997c7119bede2f26e51d8c786bc (diff)
parent84a1caf1453c3d44050bd22db958af4a7f99315c (diff)
downloadblackbird-op-linux-5b1f6d81e4c63ae30d92678cc35081001add7674.tar.gz
blackbird-op-linux-5b1f6d81e4c63ae30d92678cc35081001add7674.zip
Merge 3.5-rc7 into char-misc-next.
This lets us pick up the mei driver changes that we need in order to handle future merge issues. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'Documentation/devicetree/bindings/mmc/mmc-spi-slot.txt')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud