• Linus Torvalds's avatar
    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 · 55ddf14b
    Linus Torvalds authored
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
      ieee1394: schedule for removal
      firewire: core: use separate timeout for each transaction
      firewire: core: Fix tlabel exhaustion problem
      firewire: core: make transaction label allocation more robust
      firewire: core: clean up config ROM related defined constants
      ieee1394: mark char device files as not seekable
      firewire: cdev: mark char device files as not seekable
      firewire: ohci: cleanups and fix for nonstandard build without debug facility
      firewire: ohci: wait for PHY register accesses to complete
      firewire: ohci: fix up configuration of TI chips
      firewire: ohci: enable 1394a enhancements
      firewire: ohci: do not clear PHY interrupt status inadvertently
      firewire: ohci: add a function for reading PHY registers
    
    Trivial conflicts in Documentation/feature-removal-schedule.txt
    55ddf14b
core-cdev.c 38 KB