diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-09 19:32:03 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-09 19:32:03 +0200 |
| commit | b5f0998cae3d7ea56d3d8377e46328fe972b9546 (patch) | |
| tree | 497531102958a4c364521cfd9f3b0110aa6d8db0 /drivers/mtd/maps/sa1100-flash.c | |
| parent | Merge branch 'for-v3.12' of git://git.linaro.org/people/mszyprowski/linux-dma... (diff) | |
| parent | firewire: ohci: Fix deadlock at bus reset (diff) | |
| download | linux-b5f0998cae3d7ea56d3d8377e46328fe972b9546.tar.xz linux-b5f0998cae3d7ea56d3d8377e46328fe972b9546.zip | |
Merge tag 'firewire-updates' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'drivers/mtd/maps/sa1100-flash.c')
0 files changed, 0 insertions, 0 deletions