From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 20 Nov 2014 11:03:16 +0000 (+0100)
Subject: Merge tag 'omap-for-v3.19/w1-and-l3-noc' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=22b7db80a9952d6af27b0cca71e369fdbc5b587f;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge tag 'omap-for-v3.19/w1-and-l3-noc' of git://git./linux/kernel/git/tmlind/linux-omap into next/drivers

Pull "omap driver changes for v3.19" from Tony Lindgren:

Few omap driver changes to add minimal device tree support
for the omap 1w driver, and to fix resume and interrupt issues
on the l3-noc driver.

* tag 'omap-for-v3.19/w1-and-l3-noc' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  bus: omap_l3_noc: Correct returning IRQ_HANDLED unconditionally in the irq handler
  bus: omap_l3_noc: Add resume hook to restore context
  w1: omap-hdq: support device probing with device-tree

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

22b7db80a9952d6af27b0cca71e369fdbc5b587f