Merge branch 'aio-fix' of http://evilpiepirate.org/git/linux-bcache
authorBenjamin LaHaise <bcrl@kvack.org>
Mon, 4 Nov 2013 18:45:25 +0000 (13:45 -0500)
committerBenjamin LaHaise <bcrl@kvack.org>
Mon, 4 Nov 2013 18:45:25 +0000 (13:45 -0500)

Trivial merge