git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
dcf81c1
62aa2b5
)
Merge tag 'v3.3-rc2' into depends/rmk/for-armsoc
author
Olof Johansson
<olof@lixom.net>
Tue, 7 Feb 2012 23:04:15 +0000
(15:04 -0800)
committer
Olof Johansson
<olof@lixom.net>
Tue, 7 Feb 2012 23:05:20 +0000
(15:05 -0800)
There were conflicts between fixes going in after 3.3-rc1 and
Russell's stable arm-soc base branch. Resolving it in the dependency
branch so that each topic branch shares the same resolution.
Conflicts:
arch/arm/mach-at91/at91cap9.c
arch/arm/mach-at91/at91sam9g45.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff