git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
fe2c080
b8291ad
)
Merge current mainline tree into linux-omap tree
author
Tony Lindgren
<tony@atomide.com>
Mon, 19 May 2008 19:02:14 +0000
(12:02 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Mon, 19 May 2008 19:02:14 +0000
(12:02 -0700)
Merge branches 'master' and 'linus'
Conflicts:
arch/arm/mach-omap2/clock.c
arch/arm/mach-omap2/clock34xx.h
arch/arm/plat-omap/dma.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff