From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 20 Dec 2016 22:48:53 +0000 (-0800)
Subject: Merge tag 'xtensa-20161219' of git://github.com/jcmvbkbc/linux-xtensa
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ec92b88c3c05dd9bc75379014858c504ebb9ecbc;p=linux-beck.git

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
---

ec92b88c3c05dd9bc75379014858c504ebb9ecbc