]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'scsi/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 24 Aug 2012 01:37:31 +0000 (11:37 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 24 Aug 2012 01:37:31 +0000 (11:37 +1000)
commit81ad6b550db4f0921c7f07f7519a48e4017ea2ae
treeb558d230e086494f676a731534f7927925c18eaf
parent506ef92cffbe863c935aa9ed506a43c452e8d4fe
parent641aa03172de0c66fc1d6472562cffeb6a360572
Merge remote-tracking branch 'scsi/for-next'

Conflicts:
drivers/ata/libata-core.c
Documentation/kernel-parameters.txt
drivers/ata/libata-core.c
drivers/ata/libata-eh.c
drivers/scsi/scsi_lib.c
include/linux/libata.h