| commit | bb27d4998a9e8767674e8eda225c82cc149e5bc8 | [log] [tgz] |
|---|---|---|
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Mon Feb 22 14:46:24 2016 -0800 |
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Mon Feb 22 14:46:24 2016 -0800 |
| tree | dcabb8b8cc510003637323b30ed414b1a1ec86f6 | |
| parent | 9676e84dfd641e3366a41f2c45ac5c55dbac820f [diff] | |
| parent | 35bf7692e765c2275bf93fe573f7ca868ab73453 [diff] |
Merge char-misc-next into staging-next This resolves the merge issues and confusions people were having with the goldfish drivers due to changes for them showing up in two different trees. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>