git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8128057
a4ac0d8
)
Merge 'staging-next' to Linus's tree
author
Greg Kroah-Hartman
<gregkh@suse.de>
Thu, 28 Oct 2010 16:44:56 +0000
(09:44 -0700)
committer
Greg Kroah-Hartman
<gregkh@suse.de>
Thu, 28 Oct 2010 16:44:56 +0000
(09:44 -0700)
This merges the staging-next tree to Linus's tree and resolves
some conflicts that were present due to changes in other trees that were
affected by files here.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff