]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'libata/NEXT'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Sep 2012 01:04:01 +0000 (11:04 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Sep 2012 01:04:01 +0000 (11:04 +1000)
1  2 
drivers/ata/libata-core.c

Simple merge