Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 18 Nov 2010 23:01:43 +0000 (15:01 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 18 Nov 2010 23:01:43 +0000 (15:01 -0800)
commit589136bfa784a4558b397f017ca2f06f0ca9080e
tree1a95899281bfda19bf61d061230d82ac8637141b
parent5d3efe0735350ca9329259f34ac6a84b36dd83f2
parent23e701e6208191ad103517ae7a700f2dc59ab2ec
Merge branch 'upstream-linus' of git://git./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