OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a5f17d1
9918cea
)
Merge branch 'at91-3.4-base' of git://github.com/at91linux/linux-at91 into at91/base
author
Olof Johansson
<olof@lixom.net>
Tue, 7 Feb 2012 23:11:31 +0000
(15:11 -0800)
committer
Olof Johansson
<olof@lixom.net>
Tue, 7 Feb 2012 23:11:31 +0000
(15:11 -0800)
* 'at91-3.4-base' of git://github.com/at91linux/linux-at91:
ARM: at91: code removal of CAP9 SoC
Conflicts:
arch/arm/mach-at91/at91cap9.c
Trivial merge