diff options
| author | Tejun Heo <tj@kernel.org> | 2014-03-07 10:23:57 -0500 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2014-03-07 10:23:57 -0500 |
| commit | 5078585a18c8cb7d1b6b7744fce842dadb3b7c72 (patch) | |
| tree | 0c3d8a25acd4b34f0d460bd9ef6173f72ec2ade2 /lib/mpi/mpi-internal.h | |
| parent | 7104ce9b349e0b0c9a71ee25efeb007057029677 (diff) | |
| parent | c3bebc71c4bcdafa24b506adf0c1de3c1f77e2e0 (diff) | |
Merge branch 'master' into wq/for-3.15
Pull 3.14-rc5 into wq/for-3.15 to receive nvme updates which the
scheduled PREPARE_DELAYED_WORK() updates depend on.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'lib/mpi/mpi-internal.h')
0 files changed, 0 insertions, 0 deletions