Merge branch 'verify-trigger'
authorJens Axboe <axboe@fb.com>
Tue, 11 Nov 2014 18:10:35 +0000 (11:10 -0700)
committerJens Axboe <axboe@fb.com>
Tue, 11 Nov 2014 18:10:35 +0000 (11:10 -0700)

Trivial merge