git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
02f1744
3870564
)
Merge source.mvista.com:linux-omap
author
Juha Yrjola
<juha.yrjola@nokia.com>
Tue, 18 Apr 2006 17:02:48 +0000
(20:02 +0300)
committer
Juha Yrjola
<juha.yrjola@nokia.com>
Tue, 18 Apr 2006 17:02:48 +0000
(20:02 +0300)
Conflicts:
arch/arm/mach-omap1/board-nokia770.c
drivers/i2c/chips/tlv320aic23.c
sound/arm/omap-aic23.h
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff