diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-02-14 23:36:04 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-02-14 23:36:04 +0100 |
| commit | 249f3c4fe4fdef159d3f9b3f7a6c41a92103c860 (patch) | |
| tree | 58abfec8444741fd3bd403a908be50c4f63d4842 /block/blk-mq-sysfs.c | |
| parent | xen/hvc: constify hv_ops structures (diff) | |
| parent | Linux 4.5-rc4 (diff) | |
| download | linux-249f3c4fe4fdef159d3f9b3f7a6c41a92103c860.tar.xz linux-249f3c4fe4fdef159d3f9b3f7a6c41a92103c860.zip | |
Merge 4.5-rc4 into tty-next
We want the fixes in here, and this resolves a merge error in tty_io.c
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'block/blk-mq-sysfs.c')
0 files changed, 0 insertions, 0 deletions