git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
62aa2b5
dcf81c1
)
Merge remote-tracking branch 'armsoc/depends/rmk/for-armsoc' into at91-3.4-base
author
Nicolas Ferre
<nicolas.ferre@atmel.com>
Fri, 3 Feb 2012 11:32:26 +0000
(12:32 +0100)
committer
Nicolas Ferre
<nicolas.ferre@atmel.com>
Fri, 3 Feb 2012 11:32:26 +0000
(12:32 +0100)
Conflicts:
arch/arm/mach-at91/at91cap9.c
arch/arm/mach-at91/at91sam9g45.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff