diff options
| author | Praneeth Bajjuri <praneeth@ti.com> | 2015-02-03 14:27:36 -0600 |
|---|---|---|
| committer | Praneeth Bajjuri <praneeth@ti.com> | 2015-02-03 14:27:36 -0600 |
| commit | 29044f4094cf5a2bf4231664150fac80ed4c3bdd (patch) | |
| tree | 783591d24377374ee144ccb34a03bda411a59f8a /arch | |
| parent | b2a6a3d144669701732568cde5cce17aa37c1ae1 (diff) | |
| parent | 2b84d7abbc77c51bee46026e4b9e31e3e583be29 (diff) | |
Merge branch 'ti-linux-3.14.y' of git://git.ti.com/ti-linux-kernel/ti-linux-kernel into p-ti-linux-3.14.y-common
* 'ti-linux-3.14.y' of git://git.ti.com/ti-linux-kernel/ti-linux-kernel:
remoteproc/pruss: fix shutdown for manually booted PRU cores
remoteproc/pruss: fix the cleanup path in pru_rproc_probe()
iommu/omap: Fix a sleeping function invocation in atomic context bug
remoteproc/pruss: use match data instead of platform data for PRUs
remoteproc/pruss: fix a crash with platform_device_unregister
iommu/omap: Fix a minor typo in debugfs output
Change-Id: I320e320a4da0b4a44e2eecd60dc4f85b559b3c5b
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
Diffstat (limited to 'arch')
0 files changed, 0 insertions, 0 deletions