diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-20 23:48:53 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-20 23:48:53 +0100 |
| commit | ec92b88c3c05dd9bc75379014858c504ebb9ecbc (patch) | |
| tree | 38b397e35e02a52e412835459216ec598706aa31 /Documentation/security/tpm/index.rst | |
| parent | Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jac... (diff) | |
| parent | xtensa: update DMA-related Documentation/features entries (diff) | |
| download | linux-ec92b88c3c05dd9bc75379014858c504ebb9ecbc.tar.xz linux-ec92b88c3c05dd9bc75379014858c504ebb9ecbc.zip | |
Merge tag 'xtensa-20161219' of git://github.com/jcmvbkbc/linux-xtensa
Pull Xtensa updates from Max Filippov:
- enable HAVE_DMA_CONTIGUOUS, configure shared DMA pool reservation in
kc705 DTS
- update xtensa DMA-related Documentation/features entries
- clean up arch/xtensa/kernel/setup.c: move S32C1I self-test out of it,
remove unused declarations, fix screen_info definition
* tag 'xtensa-20161219' of git://github.com/jcmvbkbc/linux-xtensa:
xtensa: update DMA-related Documentation/features entries
xtensa: configure shared DMA pool reservation in kc705 DTS
xtensa: enable HAVE_DMA_CONTIGUOUS
xtensa: move S32C1I self-test to a separate file
xtensa: fix screen_info, clean up unused declarations in setup.c
Diffstat (limited to 'Documentation/security/tpm/index.rst')
0 files changed, 0 insertions, 0 deletions