OSDN Git Service

Merge tag 'omap-for-v3.19/w1-and-l3-noc' of git://git.kernel.org/pub/scm/linux/kernel...
authorArnd Bergmann <arnd@arndb.de>
Thu, 20 Nov 2014 11:03:16 +0000 (12:03 +0100)
committerArnd Bergmann <arnd@arndb.de>
Thu, 20 Nov 2014 11:03:16 +0000 (12:03 +0100)
commit22b7db80a9952d6af27b0cca71e369fdbc5b587f
tree7b503b462df65060f65a9447a6fd2cbcfe68dda4
parentfe9b86fb2620572e5e7eba1eab18a016dfd11197
parentc4cf0935a2d8fe6d186bf4253ea3c4b4a8a8a710
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>