git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9d297f5
da27468
)
Merge branch 'for_3.3/uart/runtime-pm' of git://git.kernel.org/pub/scm/linux/kernel...
author
Tony Lindgren
<tony@atomide.com>
Fri, 16 Dec 2011 22:01:03 +0000
(14:01 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Fri, 16 Dec 2011 22:01:03 +0000
(14:01 -0800)
Conflicts:
arch/arm/mach-omap2/pm34xx.c
Trivial merge