git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
461df4d
c773298
)
Merge Linus's tree into staging-next
author
Greg Kroah-Hartman
<gregkh@suse.de>
Thu, 9 Jun 2011 20:49:02 +0000
(13:49 -0700)
committer
Greg Kroah-Hartman
<gregkh@suse.de>
Thu, 9 Jun 2011 20:49:02 +0000
(13:49 -0700)
This was done to resolve the conflicts that were in a number of files
due to changes done upstream with others done in the staging-next
branch.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff