projects
/
platform
/
kernel
/
linux-starfive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ff6a816
3329659
)
Merge tag 'zynq-soc-for-3.20' of https://github.com/Xilinx/linux-xlnx into next/soc
author
Olof Johansson
<olof@lixom.net>
Thu, 29 Jan 2015 22:04:22 +0000
(14:04 -0800)
committer
Olof Johansson
<olof@lixom.net>
Thu, 29 Jan 2015 22:08:04 +0000
(14:08 -0800)
Merge "Zynq SoC changes for 3.20" from Michal Simek:
arm: Xilinx Zynq SoC patches for v3.20
- Enable pincontrol
- Simplified SLCR initialization
- Setup default ARCH_NR_GPIO
* tag 'zynq-soc-for-3.20' of https://github.com/Xilinx/linux-xlnx:
ARM: zynq: Simplify SLCR initialization
ARM: zynq: PM: Fixed simple typo.
ARM: zynq: Setup default gpio number for Xilinx Zynq
ARM: zynq: Enable pinctrl
Signed-off-by: Olof Johansson <olof@lixom.net>
1
2
arch/arm/Kconfig
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
arch/arm/Kconfig
Simple merge