]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'scsi/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 7 Sep 2012 02:11:05 +0000 (12:11 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 7 Sep 2012 02:11:05 +0000 (12:11 +1000)
1  2 
drivers/ata/libata-core.c
drivers/scsi/ipr.c

Simple merge
Simple merge