]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'libata/NEXT'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 21 Mar 2013 01:07:07 +0000 (12:07 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 21 Mar 2013 01:07:07 +0000 (12:07 +1100)
1  2 
drivers/ata/libata-acpi.c

Simple merge