summaryrefslogtreecommitdiffstats
path: root/Documentation/filesystems/ocfs2.txt
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-03-17 17:52:24 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2008-03-17 17:52:24 +0100
commitbde4f8fa8db2abd5ac9c542d76012d0fedab050f (patch)
tree1be905db5b97da31358851aee538fa19ea6381c4 /Documentation/filesystems/ocfs2.txt
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus (diff)
parentahci: Add Marvell 6121 SATA support (diff)
downloadlinux-bde4f8fa8db2abd5ac9c542d76012d0fedab050f.tar.xz
linux-bde4f8fa8db2abd5ac9c542d76012d0fedab050f.zip
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: ahci: Add Marvell 6121 SATA support pata_ali: use atapi_cmd_type() to determine cmd type instead of transfer size ahci: implement skip_host_reset parameter ahci: request all PCI BARs devres: implement pcim_iomap_regions_request_all() libata-acpi: improve dock event handling
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions