git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7a8d53a
422bef8
)
Merge current mainline tree into linux-omap tree
author
Tony Lindgren
<tony@atomide.com>
Mon, 24 Aug 2009 09:18:17 +0000
(12:18 +0300)
committer
Tony Lindgren
<tony@atomide.com>
Mon, 24 Aug 2009 09:18:17 +0000
(12:18 +0300)
Merge branches 'master' and 'linus'
Conflicts:
arch/arm/mach-omap2/board-omap3evm.c
drivers/net/netxen/netxen_nic_init.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff