diff options
| author | David Sterba <dsterba@suse.com> | 2016-05-25 22:51:02 +0200 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2016-05-25 22:51:02 +0200 |
| commit | e73440868fde7cce4a93583a4fa2db9a8938a7ed (patch) | |
| tree | 4149ed8954a0c344b354769d1c9bbed9a8e54114 | |
| parent | c315ef8d9db7f1a0ebd023a395ebdfde1c68057e (diff) | |
| parent | f1fee6534dcfbf468a159789aa202db2bce8c200 (diff) | |
Merge branch 'misc-4.7' into for-chris-4.7-20160525