diff options
| author |   Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-06-12 17:46:02 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-06-12 17:46:02 +0200 |
| commit | 64663b1936c93f8f27246e9b7c252ed6fb81fcba (patch) | |
| tree | b11dde342b011f34e6093b21f53c71688570c6ab /include/linux/kernel.h | |
| parent | Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next (diff) | |
| parent | Merge branch 'acpi-thermal' (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>
Diffstat (limited to 'include/linux/kernel.h')
0 files changed, 0 insertions, 0 deletions