diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-11-01 22:16:31 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-11-01 22:16:31 -0500 |
| commit | aefba081d7b7dfd1c5752f6e6e709d8b5ab80ab7 (patch) | |
| tree | 1fd355ab8273cf6d3cc4d7f744370a8e8969a0a5 /drivers/mmc/at91_mci.c | |
| parent | 3ccfc65c5004e5fe5cfbffe43b8acc686680b53e (diff) | |
| parent | 732f74a46711c0724885703fb689c79139c84a3c (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:
Revert "[PATCH] Add 0x7110 piix to ata_piix.c"
[libata] sata_nv: Add PCI IDs
[PATCH] ahci: fix status register check in ahci_softreset
Diffstat (limited to 'drivers/mmc/at91_mci.c')
0 files changed, 0 insertions, 0 deletions