OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
bc1dfff
e81a0e7
)
Merge commit 'e81a0e771c10de86fdb52c6baf534ff5fdeec72c' into topic/soix
author
Daniel Vetter
<daniel.vetter@ffwll.ch>
Thu, 12 Jun 2014 15:46:02 +0000
(17:46 +0200)
committer
Daniel Vetter
<daniel.vetter@ffwll.ch>
Thu, 12 Jun 2014 15:46:02 +0000
(17:46 +0200)
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>
Trivial merge