diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-06-20 03:43:19 +0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-06-20 03:43:19 +0400 |
| commit | a44bde66bec168889c95bd1d0d15834b02387901 (patch) | |
| tree | 70e8d2bbc26d72d51928e6aacb274829f835a5d1 /include/linux/isapnp.h | |
| parent | ef0a3402cccf75b43b1ed854f57fb11b54a1241a (diff) | |
| parent | 50dbb4cfbc264b074759e8fb5d8e0c0496a1b072 (diff) | |
| download | linux-a44bde66bec168889c95bd1d0d15834b02387901.tar.xz | |
Merge tag 'zynq-dt-for-3.11' of git://git.xilinx.com/linux-xlnx into next/dt
From Michal Simek:
arm: Xilinx Zynq dt changes for v3.11
The branch contains:
- DT uart handling cleanup
- Support for zc706 and zed board
- Removal of board compatible string
* tag 'zynq-dt-for-3.11' of git://git.xilinx.com/linux-xlnx:
arm: dt: zynq: Add support for the zed platform
arm: dt: zynq: Add support for the zc706 platform
arm: dt: zynq: Use 'status' property for UART nodes
arm: zynq: Remove board specific compatibility string
clk: zynq: Remove deprecated clock code
arm: zynq: Migrate platform to clock controller
clk: zynq: Add clock controller driver
clk: zynq: Factor out PLL driver
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'include/linux/isapnp.h')
0 files changed, 0 insertions, 0 deletions