From: Arnd Bergmann <arnd@arndb.de>
Date: Wed, 16 Aug 2017 19:41:21 +0000 (+0200)
Subject: Merge tag 'tee-drv-for-4.14' of http://git.linaro.org/people/jens.wiklander/linux... 
X-Git-Tag: v4.14-rc1~67^2~13
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=45848f1d8c846ebbd49dc1e82da250befb348ff1;p=linux.git

Merge tag 'tee-drv-for-4.14' of http://git.linaro.org/people/jens.wiklander/linux-tee into next/drivers

Pull "Small fixes and enhancements for the TEE subsystem" from Jens Wiklander:

* tag 'tee-drv-for-4.14' of http://git.linaro.org/people/jens.wiklander/linux-tee:
  tee: optee: sync with new naming of interrupts
  tee: indicate privileged dev in gen_caps
  tee: optee: interruptible RPC sleep
  tee: optee: add const to tee_driver_ops and tee_desc structures
  tee: tee_shm: Constify dma_buf_ops structures.
  tee: add forward declaration for struct device
  tee: optee: fix uninitialized symbol 'parg'
---

45848f1d8c846ebbd49dc1e82da250befb348ff1