git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
24449b4
1abccbf
)
Merge branch 'omap-pool'
author
Tony Lindgren
<tony@atomide.com>
Tue, 7 Apr 2009 22:55:24 +0000
(15:55 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Tue, 7 Apr 2009 22:55:24 +0000
(15:55 -0700)
Conflicts:
arch/arm/mach-omap2/board-ldp.c
arch/arm/mach-omap2/board-overo.c
drivers/regulator/core.c
drivers/regulator/twl4030-regulator.c
include/linux/i2c/twl4030.h
include/linux/regulator/driver.h
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff