diff options
| author | Mark Brown <broonie@kernel.org> | 2014-11-21 23:43:29 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-11-21 23:43:29 +0000 |
| commit | 50881c752b92d9750ea0e3c49a504d9fe732e999 (patch) | |
| tree | b98cbd45d5381d0182527a507861fbaafb570bc2 /arch/sparc/kernel/asm-offsets.c | |
| parent | 09cc926e9a6002790e69ed213217ef9874888624 (diff) | |
| parent | c583b1fec06304d6128f02b1bffff27202c66abf (diff) | |
Merge remote-tracking branch 'lsk/v3.10/topic/mailbox' into linux-linaro-lsklsk-v3.10-14.11
Conflicts:
drivers/mailbox/mailbox.c
include/linux/mailbox_controller.h
Diffstat (limited to 'arch/sparc/kernel/asm-offsets.c')
0 files changed, 0 insertions, 0 deletions