]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'scsi/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 22 Aug 2012 02:05:17 +0000 (12:05 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 22 Aug 2012 02:05:17 +0000 (12:05 +1000)
commit5d701bd3225633a5b406f7ff9382713fc65cb012
tree466bd5a6c8f4a2a1c281bbb1ec04f2071cf5c909
parent056e0bf4bcdd959091c93206699853968de1508a
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