projects / profile / ivi / kernel-x86-ivi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 828f4fe fbcd049)
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)
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>

Trivial merge
Domain: System / Uncategorized;