• Linus Torvalds's avatar
    Merge branch 'upstream-linus' of... · 0cd43f83
    Linus Torvalds authored
    Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
    
    * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: (48 commits)
      ieee1394: raw1394: arm functions slept in atomic context
      ieee1394: sbp2: enable auto spin-up for all SBP-2 devices
      MAINTAINERS: updates to IEEE 1394 subsystem maintainership
      ieee1394: ohci1394: check for errors in suspend or resume
      set power state of firewire host during suspend
      ieee1394: ohci1394: more obvious endianess handling
      ieee1394: ohci1394: fix endianess bug in debug message
      ieee1394: sbp2: don't prefer MODE SENSE 10
      ieee1394: nodemgr: grab class.subsys.rwsem in nodemgr_resume_ne
      ieee1394: nodemgr: fix rwsem recursion
      ieee1394: sbp2: more help in Kconfig
      ieee1394: sbp2: prevent rare deadlock in shutdown
      ieee1394: sbp2: update includes
      ieee1394: sbp2: better handling of transport errors
      ieee1394: sbp2: recheck node generation in sbp2_update
      ieee1394: sbp2: safer agent reset in error handlers
      ieee1394: sbp2: handle "sbp2util_node_write_no_wait failed"
      CONFIG_PM=n slim: drivers/ieee1394/ohci1394.c
      ieee1394: safer definition of empty macros
      video1394: add poll file operation support
      ...
    0cd43f83
MAINTAINERS 72.6 KB