git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2a4625e
adee14b
)
Merge current mainline tree into linux-omap tree
author
Tony Lindgren
<tony@atomide.com>
Wed, 10 Sep 2008 17:27:10 +0000
(10:27 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Wed, 10 Sep 2008 17:27:10 +0000
(10:27 -0700)
Merge branches 'master' and 'linus'
Conflicts:
arch/arm/mach-omap1/mcbsp.c
arch/arm/mach-omap2/mcbsp.c
arch/arm/plat-omap/include/mach/mcbsp.h
arch/arm/plat-omap/mcbsp.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff