Merge tag 'firewire-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee139...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 10 Jul 2013 18:02:58 +0000 (11:02 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 10 Jul 2013 18:02:58 +0000 (11:02 -0700)
commitbb93109e1544e2a4d12c2c35bf1af84c25a2699d
treee60cd9bc1efbaa9500a4ae59cf4f6186eb4ef29e
parent23e3a1d971f6658de5aa423011c153765f28fe26
parentbcabcfd2e09ceb8599a33001e812e7cbad00fc4d
Merge tag 'firewire-updates' of git://git./linux/kernel/git/ieee1394/linux1394

Pull firewire updates from Stefan Richter:
 "Make struct ieee1394_device_id.driver_data actually avaliable to 1394
  protocol drivers.  This is especially useful to 1394 audio drivers for
  model-specific parameters and methods"

* tag 'firewire-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394:
  firewire: remove support of fw_driver.driver.probe and .remove methods
  firewire: introduce fw_driver.probe and .remove methods
drivers/staging/fwserial/fwserial.c
sound/firewire/scs1x.c