diff options
| author | Linus Torvalds | 2006-12-16 09:54:23 -0800 |
|---|---|---|
| committer | Linus Torvalds | 2006-12-16 09:54:23 -0800 |
| commit | 99f5e9718185f07458ae70c2282c2153a2256c91 (patch) | |
| tree | de0565dcc4fdabf40352b6bc0c80cc6634748f15 /drivers/w1/w1_int.h | |
| parent | a08727bae727fc2ca3a6ee9506d77786b71070b3 (diff) | |
| parent | 5c9a76118d24f044b8d8ee721dbbf4e5c7db3dbb (diff) | |
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:
[PATCH] pata_via: Cable detect error
[PATCH] Fix help text for CONFIG_ATA_PIIX
[PATCH] initializer entry defined twice in pata_rz1000
[PATCH] ata: fix platform_device_register_simple() error check
[PATCH] ahci: do not mangle saved HOST_CAP while resetting controller
[PATCH] libata: don't initialize sg in ata_exec_internal() if DMA_NONE (take #2)
[libata] sata_svw: Disable ATAPI DMA on current boards (errata workaround)
[libata] use kmap_atomic(KM_IRQ0) in SCSI simulator
[PATCH] ata_piix: use piix_host_stop() in ich_pata_ops
[PATCH] ata_piix: IDE mode SATA patch for Intel ICH9
Diffstat (limited to 'drivers/w1/w1_int.h')
0 files changed, 0 insertions, 0 deletions