git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c037732
37cd4fe
8bf9586
330fadd
14a678f
)
Merge branches 'devel-fixes', 'devel-cleanup', 'devel-board', 'devel-hwspinlock'...
author
Tony Lindgren
<tony@atomide.com>
Tue, 15 Feb 2011 02:06:12 +0000
(18:06 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Tue, 15 Feb 2011 02:06:12 +0000
(18:06 -0800)
Conflicts:
arch/arm/mach-omap2/devices.c
drivers/spi/omap2_mcspi.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff