diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-19 15:36:08 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-19 15:36:08 +0100 |
commit | 0a191749ce19112f8f20675232b951dccd4ae00e (patch) | |
tree | b81540374236beb22d50daaa856910257c0e6e2d /drivers/hv | |
parent | Drivers: hv: fcopy_open() can be static (diff) | |
parent | mei: set client's read_cb to NULL when flow control fails (diff) | |
download | linux-0a191749ce19112f8f20675232b951dccd4ae00e.tar.xz linux-0a191749ce19112f8f20675232b951dccd4ae00e.zip |
Merge branch 'char-misc-linus' into char-misc-next
We want the mei change here to allow future mei patches to apply
properly.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/hv')
0 files changed, 0 insertions, 0 deletions