| commit | 64663b1936c93f8f27246e9b7c252ed6fb81fcba | [log] [tgz] |
|---|---|---|
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | Thu Jun 12 17:46:02 2014 +0200 |
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | Thu Jun 12 17:46:02 2014 +0200 |
| tree | b11dde342b011f34e6093b21f53c71688570c6ab | |
| parent | bc1dfff04a5d4064ba0db1fab13f84ab4f333d2b [diff] | |
| parent | e81a0e771c10de86fdb52c6baf534ff5fdeec72c [diff] |
Merge commit 'e81a0e771c10de86fdb52c6baf534ff5fdeec72c' into topic/soix Need to have a baseline of drm-next + acpi-next to merge new cool SOix features for 3.17. No conflicts, so won't cause trouble. Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>