git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
262a45e
6fd210a
)
Merge branch 'pm-upstream/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...
author
Tony Lindgren
<tony@atomide.com>
Sun, 16 Aug 2009 15:53:44 +0000
(18:53 +0300)
committer
Tony Lindgren
<tony@atomide.com>
Sun, 16 Aug 2009 15:53:44 +0000
(18:53 +0300)
Conflicts:
arch/arm/mach-omap2/serial.c
Trivial merge