commit | 5d44f4b3484e85c8d4527ecaca5e536da774ae21 | [log] [tgz] |
---|---|---|
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Sun Aug 09 16:28:09 2015 -0700 |
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Sun Aug 09 16:28:09 2015 -0700 |
tree | 5c699fd097844ecdf30ef9b47444064d713ac410 | |
parent | 4816693286d4ff9219b1cc72c2ab9c589448ebcb [diff] | |
parent | f7644cbfcdf03528f0f450f3940c4985b2291f49 [diff] |
Merge 4.2-rc6 into char-misc-next We want the fixes in Linus's tree in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>