| commit | 807dc0668e7af56a49cf360c2d12f9b04083ac47 | [log] [tgz] |
|---|---|---|
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Mon Mar 23 21:36:48 2015 +0100 |
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Mon Mar 23 21:36:48 2015 +0100 |
| tree | adaa1c3ec5d7c39b5ebe62e45825c029e179cecf | |
| parent | 5e790610bc19887387d5914cf8ed58434c5bde08 [diff] | |
| parent | bc465aa9d045feb0e13b4a8f32cc33c1943f62d6 [diff] |
Merge 4.0-rc5 into staging-testing We want the staging tree fixes that are upstream here as well to prevent merge conflicts from people trying to clean up code. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>