diff options
author | Jon Medhurst <tixy@linaro.org> | 2015-03-17 11:38:20 +0000 |
---|---|---|
committer | Jon Medhurst <tixy@linaro.org> | 2015-03-17 11:38:20 +0000 |
commit | 652dd9401b58d963bad673847e80411575936aff (patch) | |
tree | 376a58008b925820da5e9af342780c2664bd8ab4 /drivers/mailbox/Kconfig | |
parent | 27843e29fbd39edd8d071a4ad8317ddce654e110 (diff) | |
parent | b4563783e8792df1a7a16da9d6406de5b34979a6 (diff) |
Merge branch 'tracking-armlt-config64' into integration-linaro-vexpress64
Conflicts:
linaro/configs/vexpress64.conf
Diffstat (limited to 'drivers/mailbox/Kconfig')
0 files changed, 0 insertions, 0 deletions