git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
631a7b5
2944628
)
Merge branch 'soc' into boards
author
Simon Horman
<horms@verge.net.au>
Thu, 8 Nov 2012 08:49:35 +0000
(17:49 +0900)
committer
Simon Horman
<horms@verge.net.au>
Thu, 8 Nov 2012 08:49:35 +0000
(17:49 +0900)
Conflicts:
arch/arm/configs/marzen_defconfig
1
2
arch/arm/mach-shmobile/Kconfig
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-shmobile/Makefile
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-shmobile/board-mackerel.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
arch/arm/mach-shmobile/Kconfig
Simple merge
diff --cc
arch/arm/mach-shmobile/Makefile
Simple merge
diff --cc
arch/arm/mach-shmobile/board-mackerel.c
Simple merge
git.openpandora.org / pandora-kernel.git / commitdiff