diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-05-16 15:09:53 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-05-16 15:09:53 +1000 |
commit | d94f47e8b4c0ce846ac2d0ddad9611f8a22ea6c6 (patch) | |
tree | a98f0194775ff8378280bd5f851de523d830e6d5 /arch/xtensa/mm/tlb.c | |
parent | 5c701c60b7040829b81d17d81e49ebbfb3a6b33a (diff) | |
parent | e26f1db9b8d74617519e50b41749900d0a257406 (diff) |
Merge remote-tracking branch 'tty/tty-next'
Conflicts:
arch/arm64/kernel/early_printk.c
Diffstat (limited to 'arch/xtensa/mm/tlb.c')
0 files changed, 0 insertions, 0 deletions