diff options
| author |   Olof Johansson <olof@lixom.net> | 2014-02-18 16:04:58 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-02-18 16:04:58 -0800 |
| commit | c5b84c45614fce627c2af3dc4098edeb1817ea8d (patch) | |
| tree | e04e4212d6810424883a93c51ac85852bbf55dc1 /include/rdma/ib_cm.h | |
| parent | ARM: imx6: build pm-imx6q.c independently of CONFIG_PM (diff) | |
| parent | ARM: dove: dt: revert PMU interrupt controller node (diff) | |
| download | linux-dev-c5b84c45614fce627c2af3dc4098edeb1817ea8d.tar.xz linux-dev-c5b84c45614fce627c2af3dc4098edeb1817ea8d.zip | |
Merge tag 'mvebu-dt-fixes-3.14' of git://git.infradead.org/linux-mvebu into fixes
mvebu dt fixes for v3.14
- mvebu: add missing 'eth3' alias for mv78260
- dove: revert PMU interrupt controller node, wait for driver to land.
* tag 'mvebu-dt-fixes-3.14' of git://git.infradead.org/linux-mvebu:
ARM: dove: dt: revert PMU interrupt controller node
ARM: mvebu: dt: add missing alias 'eth3' on Armada XP mv78260
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'include/rdma/ib_cm.h')
0 files changed, 0 insertions, 0 deletions