summaryrefslogtreecommitdiffstats
path: root/Documentation/zorro.txt
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-03-02 20:09:08 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-03-02 20:09:08 -0800
commit13df7977431e3b906a23bb75f29e0f40a8d73f87 (patch)
treebc2c78c3b816a65f90c31cccebdc15b38352c045 /Documentation/zorro.txt
parent6d8b3e1ad3d3815d9c87b8553493301e243af76a (diff)
parent0414855fdc4a40da05221fc6062cccbc0c30f169 (diff)
downloadblackbird-obmc-linux-13df7977431e3b906a23bb75f29e0f40a8d73f87.tar.gz
blackbird-obmc-linux-13df7977431e3b906a23bb75f29e0f40a8d73f87.zip
Merge 3.14-rc5 into driver-core-next
We want the fixes in here.
Diffstat (limited to 'Documentation/zorro.txt')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud