From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 9 Sep 2013 17:32:03 +0000 (-0700)
Subject: Merge tag 'firewire-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee139... 
X-Git-Tag: MMI-PSA29.97-13-9~13678
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b5f0998cae3d7ea56d3d8377e46328fe972b9546;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge tag 'firewire-updates' of git://git./linux/kernel/git/ieee1394/linux1394

Pull firewire updates from Stefan Richter:

 - Fix a regression since 3.2 inclusive: The subsystem workqueue
   deadlocked between transaction completion handling and bus reset
   handling if the worker pool could not be increased in time.

 - janitorial updates

* tag 'firewire-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394:
  firewire: ohci: Fix deadlock at bus reset
  firewire: ohci: Change module_pci_driver to module_init/module_exit
  firewire: ohci: beautify some macro definitions
  firewire: ohci: change confusing name of a struct member
  firewire: core: typecast from gfp_t to bool more safely
  firewire: WQ_NON_REENTRANT is meaningless and going away
---

b5f0998cae3d7ea56d3d8377e46328fe972b9546