git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2bf0f78
ff50fac
)
Merge branch 'omap-fixes-testing'
author
Tony Lindgren
<tony@atomide.com>
Thu, 1 Oct 2009 20:11:06 +0000
(13:11 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Thu, 1 Oct 2009 20:11:06 +0000
(13:11 -0700)
Conflicts:
drivers/mfd/twl4030-core.c
Trivial merge