git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3961f7c
7fa0772
)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
author
Anton Vorontsov
<avorontsov@ru.mvista.com>
Tue, 22 Sep 2009 23:49:27 +0000
(
03:49
+0400)
committer
Anton Vorontsov
<avorontsov@ru.mvista.com>
Tue, 22 Sep 2009 23:49:27 +0000
(
03:49
+0400)
Conflicts:
drivers/power/wm97xx_battery.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff