]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'scsi/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 20 Aug 2012 02:59:24 +0000 (12:59 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 20 Aug 2012 02:59:24 +0000 (12:59 +1000)
commitdf8b5db038d87f17aaa489862448b17ade1c9734
treed29e8c75a7a51692d99d731a7cf7a648060deb24
parent60848facfae3a050d38cc890c7ac64e5a873f9e0
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