| commit | 589136bfa784a4558b397f017ca2f06f0ca9080e | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Nov 18 15:01:43 2010 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Nov 18 15:01:43 2010 -0800 |
| tree | 1a95899281bfda19bf61d061230d82ac8637141b | |
| parent | 5d3efe0735350ca9329259f34ac6a84b36dd83f2 [diff] | |
| parent | 23e701e6208191ad103517ae7a700f2dc59ab2ec [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] remove SCSI host lock and serial number usage from ata_scsi_queuecmd