diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-01-26 02:08:28 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-01-26 02:08:28 +0100 |
| commit | 2ba14a017a4ba8d2266316f481d4ad7400073d18 (patch) | |
| tree | 6e86dcbbb7898eb747f1198e33961eb68bfcdb4d /fs/ocfs2/dlmglue.h | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol... (diff) | |
| parent | fix drivers/ata/sata_fsl.c double-decl (diff) | |
| download | linux-2ba14a017a4ba8d2266316f481d4ad7400073d18.tar.xz linux-2ba14a017a4ba8d2266316f481d4ad7400073d18.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: (67 commits)
fix drivers/ata/sata_fsl.c double-decl
[libata] Prefer SCSI_SENSE_BUFFERSIZE to sizeof()
pata_legacy: Merge winbond support
ata_generic: Cenatek support
pata_winbond: error return
pata_serverworks: Fix cable types and cosmetics
pata_mpc52xx: remove un-needed assignment
libata: fix off-by-one in error categorization
ahci: factor out AHCI enabling and enable AHCI before reading CAP
ata_piix: implement SIDPR SCR access
ata_piix: convert to prepare - activate initialization
libata: factor out ata_pci_activate_sff_host() from ata_pci_one()
[libata] Prefer SCSI_SENSE_BUFFERSIZE to sizeof()
pata_legacy: resychronize with upstream changes and resubmit
[libata] pata_legacy: typo fix
[libata] pata_winbond: update for new ->data_xfer hook
pata_pcmcia: convert to new data_xfer prototype
libata annotations and fixes
libata: use dev_driver_string() instead of "libata" in libata-sff.c
ata_piix: kill unused constants and flags
...
Diffstat (limited to 'fs/ocfs2/dlmglue.h')
0 files changed, 0 insertions, 0 deletions