git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7a23afa
2ffbb83
)
Merge current mainline tree into linux-omap tree
author
Tony Lindgren
<tony@atomide.com>
Wed, 21 Nov 2007 02:27:29 +0000
(18:27 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Wed, 21 Nov 2007 02:27:29 +0000
(18:27 -0800)
Merge branch 'linus'
Conflicts:
arch/arm/mach-omap1/board-h2.c
arch/arm/mach-omap2/clock.c
drivers/video/omap/Kconfig
net/ipv4/netfilter/Makefile
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff