git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c037732
8bf9586
9b7214a
14a678f
)
Merge branches 'devel-fixes', 'devel-hwspinlock', 'devel-omap4' and 'devel-mcspi...
author
Tony Lindgren
<tony@atomide.com>
Wed, 16 Feb 2011 19:39:03 +0000
(11:39 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Wed, 16 Feb 2011 19:39:03 +0000
(11:39 -0800)
Conflicts:
arch/arm/mach-omap2/devices.c
drivers/spi/omap2_mcspi.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff