git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f71fa31
1985330
)
Merge branch 'linus' into queue
author
Marcelo Tosatti
<mtosatti@redhat.com>
Thu, 19 Apr 2012 20:06:26 +0000
(17:06 -0300)
committer
Marcelo Tosatti
<mtosatti@redhat.com>
Thu, 19 Apr 2012 20:06:26 +0000
(17:06 -0300)
Merge reason: development work has dependency on kvm patches merged
upstream.
Conflicts:
Documentation/feature-removal-schedule.txt
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Trivial merge