Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: (53 commits)
  DVB: firedtv: FireDTV S2 problems with tuning solved
  DVB: firedtv: fix printk format mismatch
  ieee1394: constify device ID tables
  ieee1394: raw1394: add sparse annotations to raw1394_compat_write
  ieee1394: Storage class should be before const qualifier
  ieee1394: sbp2: follow up on "ieee1394: inherit ud vendor_id from node vendor_id"
  firewire: core: optimize propagation of BROADCAST_CHANNEL
  firewire: core: simplify broadcast channel allocation
  firewire: core: increase bus manager grace period
  firewire: core: drop unused call parameters of close_transaction
  firewire: cdev: add closure to async stream ioctl
  firewire: cdev: simplify FW_CDEV_IOC_SEND_REQUEST return value
  firewire: cdev: fix race of ioctl_send_request with bus reset
  firewire: cdev: secure add_descriptor ioctl
  firewire: cdev: amendment to "add ioctl to query maximum transmission speed"
  firewire: broadcast channel support
  firewire: implement asynchronous stream transmission
  firewire: core: normalize a function argument name
  firewire: normalize a variable name
  firewire: core: remove condition which is always false
  ...

diff --combined drivers/ieee1394/dv1394.c
index cb15bfa,4c2c025..823a629
--- 1/drivers/ieee1394/dv1394.c
--- 2/drivers/ieee1394/dv1394.c
+++ b/drivers/ieee1394/dv1394.c
@@@ -1325,7 -1325,11 +1325,7 @@@ static int dv1394_fasync(int fd, struc
  
        struct video_card *video = file_to_video_card(file);
  
 -      int retval = fasync_helper(fd, file, on, &video->fasync);
 -
 -      if (retval < 0)
 -              return retval;
 -        return 0;
 +      return fasync_helper(fd, file, on, &video->fasync);
  }
  
  static ssize_t dv1394_write(struct file *file, const char __user *buffer, size_t count, loff_t *ppos)
@@@ -2171,7 -2175,7 +2171,7 @@@ static const struct file_operations dv1
   * Export information about protocols/devices supported by this driver.
   */
  #ifdef MODULE
- static struct ieee1394_device_id dv1394_id_table[] = {
+ static const struct ieee1394_device_id dv1394_id_table[] = {
        {
                .match_flags    = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION,
                .specifier_id   = AVC_UNIT_SPEC_ID_ENTRY & 0xffffff,