diff options
| author | Olof Johansson <olof@lixom.net> | 2015-01-30 01:03:28 +0300 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-01-30 01:03:28 +0300 |
| commit | 7679f31f143bb3b770b80855af254bb6ee0a1f89 (patch) | |
| tree | 438c407327933b4766b47c7bfe95b574a280ad90 /include/linux/ceph/ceph_frag.h | |
| parent | 1215c3e65a50cc9770c8a6a1d6689fdcb673c4cc (diff) | |
| parent | ab216ac5a236756c4560ff7f07ec7e206acdf078 (diff) | |
| download | linux-7679f31f143bb3b770b80855af254bb6ee0a1f89.tar.xz | |
Merge tag 'zynq-dt-for-3.20' of https://github.com/Xilinx/linux-xlnx into next/dt
Merge "Zync DT for v3.20" from Michal Simek:
arm: Xilinx Zynq dt patches for v3.20
- Add USB chipidea driver to DT
- Add pincontrol
- Add aliases node
- Fix WDT node
* tag 'zynq-dt-for-3.20' of https://github.com/Xilinx/linux-xlnx:
ARM: zynq: DT: Add aliases node
ARM: zynq: DT: Fix binding for cadence WDT
ARM: zynq: DT: Add pinctrl information to USB nodes
ARM: zynq: DT: Remove bogus value from 'bias-disable' property
ARM: zynq: DT: Add pinctrl information
ARM: zynq: DT: Add USB to device tree
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'include/linux/ceph/ceph_frag.h')
0 files changed, 0 insertions, 0 deletions