]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-4.4/lightnvm' into for-next
authorJens Axboe <axboe@fb.com>
Tue, 3 Nov 2015 16:53:33 +0000 (09:53 -0700)
committerJens Axboe <axboe@fb.com>
Tue, 3 Nov 2015 16:53:33 +0000 (09:53 -0700)

Trivial merge