git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
332acd9
ec3cdb5
)
Merge branch 'for_3.1/pm-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/khilm...
author
Tony Lindgren
<tony@atomide.com>
Wed, 29 Jun 2011 11:45:16 +0000
(
04:45
-0700)
committer
Tony Lindgren
<tony@atomide.com>
Wed, 29 Jun 2011 11:45:16 +0000
(
04:45
-0700)
Conflicts:
arch/arm/mach-omap2/pm-debug.c
arch/arm/mach-omap2/pm.h
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff