git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8e722f8
d5b5623
)
Merge current mainline tree into linux-omap tree
author
Tony Lindgren
<tony@atomide.com>
Mon, 9 Feb 2009 21:05:28 +0000
(13:05 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Mon, 9 Feb 2009 21:05:28 +0000
(13:05 -0800)
Merge branches 'master' and 'linus'
Conflicts:
arch/arm/mach-omap2/irq.c
arch/arm/plat-omap/devices.c
arch/arm/plat-omap/dma.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff