]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'libata/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 20 Dec 2013 00:48:55 +0000 (11:48 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 20 Dec 2013 00:48:55 +0000 (11:48 +1100)
1  2 
drivers/ata/libata-scsi.c

Simple merge