From: Linus Torvalds Date: Thu, 18 Nov 2010 23:01:43 +0000 (-0800) Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi... X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=589136bfa784a4558b397f017ca2f06f0ca9080e;p=mv-sheeva.git 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 --- 589136bfa784a4558b397f017ca2f06f0ca9080e