]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'libata/NEXT'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 3 Oct 2012 02:06:36 +0000 (12:06 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 3 Oct 2012 02:06:36 +0000 (12:06 +1000)
1  2 
drivers/ata/libata-core.c

Simple merge