diff options
author | Dan Williams <dan.j.williams@intel.com> | 2016-01-10 07:53:55 -0800 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2016-01-10 07:53:55 -0800 |
commit | 8b63b6bfc1a551acf154061699028c7032d7890c (patch) | |
tree | 16882e9bc9e35eacb870a6d8a71617e579c4ffdc /kernel/trace/trace.h | |
parent | libnvdimm: fix namespace object confusion in is_uuid_busy() (diff) | |
parent | block: kill disk_{check|set|clear|alloc}_badblocks (diff) | |
download | linux-dev-8b63b6bfc1a551acf154061699028c7032d7890c.tar.xz linux-dev-8b63b6bfc1a551acf154061699028c7032d7890c.zip |
Merge branch 'for-4.5/block-dax' into for-4.5/libnvdimm
Diffstat (limited to 'kernel/trace/trace.h')
0 files changed, 0 insertions, 0 deletions