summaryrefslogtreecommitdiffstats
path: root/Documentation/DocBook
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-17 20:02:36 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-17 20:02:36 -0700
commitd3a36fb82a0864a85e238ac946817030a18c5f9a (patch)
treedaa6efef3d8ce80515a85c7500a858bd8ec0be2c /Documentation/DocBook
parente94bd23f67c87011f012f26ca0af3fcf6878eeac (diff)
parent8fd7d1b16ea0e1b3b0823ed91b58993d6c6a1cc6 (diff)
downloadlinux-d3a36fb82a0864a85e238ac946817030a18c5f9a.tar.bz2
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: sata_via: pcim_iomap_regions() conversion missed BAR5 libata: remove libata.spindown_compat sata_nv: fix fallout of devres conversion drivers/ata: remove the wildcard from sata_nv driver
Diffstat (limited to 'Documentation/DocBook')
0 files changed, 0 insertions, 0 deletions