Merge tag 'firewire-update' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 18 Oct 2016 15:28:08 +0000 (08:28 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 18 Oct 2016 15:28:08 +0000 (08:28 -0700)
Pull firewire fixlet from Stefan Richter:
 "IEEE 1394 subsystem patch: catch an initialization error in the packet
  sniffer nosy"

* tag 'firewire-update' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394:
  firewire: nosy: do not ignore errors in ioremap_nocache()


Trivial merge