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
  ...

1 files changed, 10 insertions, 27 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 2c752d18e24b..28e1c7b9244a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1398,36 +1398,29 @@ M:	Gadi Oxman <gadio@netvision.net.il>
 L:      linux-kernel@vger.kernel.org
 S:      Maintained
 
-IEEE 1394 ETHERNET (eth1394)
-L:      linux1394-devel@lists.sourceforge.net
-W:      http://www.linux1394.org/
-S:      Orphan
-
 IEEE 1394 SUBSYSTEM
 P:      Ben Collins
 M:      bcollins@debian.org
-P:      Jody McIntyre
-M:      scjody@modernduck.com
+P:      Stefan Richter
+M:      stefanr@s5r6.in-berlin.de
 L:      linux1394-devel@lists.sourceforge.net
 W:      http://www.linux1394.org/
-T:      git kernel.org:/pub/scm/linux/kernel/git/scjody/ieee1394.git
+T:      git kernel.org:/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git
 S:      Maintained
 
-IEEE 1394 OHCI DRIVER
-P:      Ben Collins
-M:      bcollins@debian.org
-P:      Jody McIntyre
-M:      scjody@modernduck.com
+IEEE 1394 IPV4 DRIVER (eth1394)
+P:      Stefan Richter
+M:      stefanr@s5r6.in-berlin.de
 L:      linux1394-devel@lists.sourceforge.net
-W:      http://www.linux1394.org/
-S:      Maintained
+S:      Odd Fixes
 
 IEEE 1394 PCILYNX DRIVER
 P:      Jody McIntyre
 M:      scjody@modernduck.com
+P:      Stefan Richter
+M:      stefanr@s5r6.in-berlin.de
 L:      linux1394-devel@lists.sourceforge.net
-W:      http://www.linux1394.org/
-S:      Maintained
+S:      Odd Fixes
 
 IEEE 1394 RAW I/O DRIVER
 P:      Ben Collins
@@ -1435,16 +1428,6 @@ M:	bcollins@debian.org
 P:      Dan Dennedy
 M:      dan@dennedy.org
 L:      linux1394-devel@lists.sourceforge.net
-W:      http://www.linux1394.org/
-S:      Maintained
-
-IEEE 1394 SBP2
-P:      Ben Collins
-M:      bcollins@debian.org
-P:      Stefan Richter
-M:      stefanr@s5r6.in-berlin.de
-L:      linux1394-devel@lists.sourceforge.net
-W:      http://www.linux1394.org/
 S:      Maintained
 
 IMS TWINTURBO FRAMEBUFFER DRIVER