diff options
| author | Mark Brown <broonie@kernel.org> | 2014-11-21 23:44:13 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-11-21 23:44:13 +0000 |
| commit | 1f0f80ecae848b0ca2ca632e94568721494f09f0 (patch) | |
| tree | 5cdae3c83dc1fe6e0d92d6085a038a7d407c1ef5 /linaro/configs | |
| parent | efbf0c1bc8f2d3496219d52c20a6ad7149a04443 (diff) | |
| parent | d0aaac8a9d2c3ad71252adcdbeebb045bce02c5a (diff) | |
Merge remote-tracking branch 'lsk/v3.14/topic/mailbox' into linux-linaro-lsk-v3.14lsk-v3.14-14.11
Conflicts:
drivers/mailbox/mailbox.c
include/linux/mailbox_controller.h
Diffstat (limited to 'linaro/configs')
0 files changed, 0 insertions, 0 deletions