git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8aef7e8
0cfd810
)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
author
Anton Vorontsov
<cbouatmailru@gmail.com>
Sat, 18 Oct 2008 16:28:24 +0000
(20:28 +0400)
committer
Anton Vorontsov
<cbouatmailru@gmail.com>
Sat, 18 Oct 2008 16:28:24 +0000
(20:28 +0400)
Conflicts:
drivers/power/Makefile
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff