Merge branch 'master' into for-3.19/drivers
authorJens Axboe <axboe@fb.com>
Wed, 19 Nov 2014 02:43:46 +0000 (19:43 -0700)
committerJens Axboe <axboe@fb.com>
Wed, 19 Nov 2014 02:43:46 +0000 (19:43 -0700)

Trivial merge