diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-24 10:19:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-24 10:19:56 -0700 |
| commit | a68aa1cc6f3203b8a332683ebde67a00f39eec43 (patch) | |
| tree | c05bd86850d8e0d0fb096a4b5f8d9f268b5561e8 /fs/ocfs2 | |
| parent | a319a2773a13bab56a0d0b3744ba8703324313b5 (diff) | |
| parent | 23930fa1cebfea6f79881c588ccd1b0781e49e3f (diff) | |
| download | linux-a68aa1cc6f3203b8a332683ebde67a00f39eec43.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: (50 commits)
[libata] Delete pata_it8172 driver
[PATCH] libata: improve handling of diagostic fail (and hardware that misreports it)
[PATCH] libata: fix non-uniform ports handling
Fix libata resource conflict for legacy mode
[libata] ata_piix: build fix
[PATCH] pata_amd: Check enable bits on Nvidia
[PATCH] Update SiS PATA
[libata] Add pata_jmicron driver to Kconfig, Makefile
[libata #pata-drivers] Trim trailing whitespace.
[libata] Trim trailing whitespace.
[libata] Add a bunch of PATA drivers.
Rename libata-bmdma.c to libata-sff.c.
libata: Grand renaming.
Clean up drivers/ata/Kconfig a bit.
[PATCH] CONFIG_PM=n slim: drivers/scsi/sata_sil*
[PATCH] sata_via: Add SATA support for vt8237a
[PATCH] libata: change path to libata in libata.tmpl
[PATCH] libata: s/CONFIG_SCSI_SATA/CONFIG_[S]ATA/g in pci/quirks.c
libata: Make sure drivers/ata is a separate Kconfig menu
[libata] ata_piix: add missing kfree()
...
Diffstat (limited to 'fs/ocfs2')
0 files changed, 0 insertions, 0 deletions