Merge branch 'pm-ti-linux-3.14.y' of git://git.ti.com/~kristo/ti-linux-kernel/pm...
authorDan Murphy <DMurphy@ti.com>
Fri, 7 Nov 2014 13:33:19 +0000 (07:33 -0600)
committerDan Murphy <DMurphy@ti.com>
Fri, 7 Nov 2014 13:33:19 +0000 (07:33 -0600)
commit74ae249502cee604977d6d5f1a3b9db607fd2b36
treeaa16e1bce1662784047f4db54e1ab21e1ab3aa7b
parent828f4fe51fa46e2713d53fe2e6c87c187a261f1a
parentfbcd049eaa2ca8c2f7d0fd2afaa67948a04255ce
Merge branch 'pm-ti-linux-3.14.y' of git://git.ti.com/~kristo/ti-linux-kernel/pm-linux-feature-tree into ti-linux-3.14.y

TI-Feature: power_management_base
TI-Tree: git://git.ti.com/~kristo/ti-linux-kernel/pm-linux-feature-tree.git
TI-Branch: pm-ti-linux-3.14.y

* 'pm-ti-linux-3.14.y' of git://git.ti.com/~kristo/ti-linux-kernel/pm-linux-feature-tree:
  bus: omap_l3_noc: Correct returning IRQ_HANDLED unconditionally in the irq handler
  bus: omap_l3_noc: Add resume hook to restore context

Signed-off-by: Dan Murphy <DMurphy@ti.com>