projects
/
profile
/
ivi
/
kernel-x86-ivi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
41569e3
5eca8f3
375dec9
)
Merge branches 'acorn', 'ebsa110' and 'sa11x0' into platforms
author
Russell King
<rmk+kernel@arm.linux.org.uk>
Sun, 25 Mar 2012 22:57:55 +0000
(23:57 +0100)
committer
Russell King
<rmk+kernel@arm.linux.org.uk>
Sun, 25 Mar 2012 22:57:55 +0000
(23:57 +0100)
1
2
3
arch/arm/Kconfig
patch
|
diff1
|
diff2
|
diff3
|
blob
|
history
diff --cc
arch/arm/Kconfig
Simple merge