Merge branch 'master' into mq-inflight
authorJens Axboe <axboe@kernel.dk>
Thu, 3 Aug 2017 18:59:31 +0000 (12:59 -0600)
committerJens Axboe <axboe@kernel.dk>
Thu, 3 Aug 2017 18:59:31 +0000 (12:59 -0600)
commitb01d38e9f5a384c289aa3761b62c8b3f73570c31
treee0ad92557e2b938010ee652da9f5ba9942393437
parent3d289d68823cbfe86d326400c5386feda777f092
parent19ec50a438c2ea3e370f6d453bf2f2e6e45ef72b
Merge branch 'master' into mq-inflight
kernel/cgroup/cgroup.c