diff options
| author | Jon Medhurst <tixy@linaro.org> | 2015-04-09 12:37:26 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2015-04-09 12:37:26 +0100 |
| commit | 2c7554c9da93fd6a442cfa383eaba519e7e2b335 (patch) | |
| tree | d19144b01d4b4e4575246532f87ae5c177a8150f /include/rdma/ib_cm.h | |
| parent | 8a9024d86769573cbf5d2d7477b4d446c5309e7c (diff) | |
| parent | 3fba00c16a96323fdeaca97d45d8ec11315f602a (diff) | |
Merge branch 'lsk-3.10-armlt-asoc' into integration-lsk-3.10-juno-androidlsk-3.10-armlt-juno-20150409
Conflicts:
arch/arm64/boot/dts/juno.dts
linaro/configs/vexpress64.conf
Diffstat (limited to 'include/rdma/ib_cm.h')
0 files changed, 0 insertions, 0 deletions