| commit | 7ac01108e71ca8ccc2ded4ee98035d0e5db9c981 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Dec 01 11:23:33 2008 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Dec 01 11:23:33 2008 -0800 |
| tree | afb50d33254337c73d450687cfeae18aa096b6c0 | |
| parent | 4bc2a9bf8cbb63f3bb9797b2bf30b2316bd27a2b [diff] | |
| parent | ac70a964b0e22a95af3628c344815857a01461b7 [diff] |
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: libata: blacklist Seagate drives which time out FLUSH_CACHE when used with NCQ [libata] pata_rb532_cf: fix signature of the xfer function [libata] pata_rb532_cf: fix and rename register definitions ata_piix: add borked Tecra M4 to broken suspend list