]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'libata/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Jan 2014 01:45:14 +0000 (12:45 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Jan 2014 01:45:14 +0000 (12:45 +1100)
commit36e3bbbb092c4cc8c01d3e894f9e4f6ea9668729
treef354fc91b04b3854529b49989063e2e977c02e8a
parent0ae454cbbf3d5f68da7b89b7ebf7dab4d6cc8d79
parent421f2c8280ecf0cdc63b0948b15d15d95c3b2fbf
Merge remote-tracking branch 'libata/for-next'

Conflicts:
drivers/ata/ahci.c
drivers/ata/ahci.c