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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: (31 commits)
  firewire: fw-sbp2: fix DMA mapping of management ORBs
  firewire: fw-sbp2: fix DMA mapping of command ORBs
  firewire: fw-sbp2: fix DMA mapping of S/G tables
  firewire: fw-sbp2: add a boundary check
  firewire: fw-sbp2: correctly align page tables
  firewire: fw-sbp2: memset wants string.h
  firewire: fw-sbp2: use correct speed in sbp2_agent_reset
  firewire: fw-sbp2: correctly dereference by container_of
  firewire: Document userspace ioctl interface.
  firewire: fw-sbp2: implement nonexclusive login
  firewire: fw-sbp2: let SCSI shutdown commands through before logout
  firewire: fw-sbp2: implement max sectors limit for some old bridges
  firewire: simplify a struct type
  firewire: support S100B...S400B and link slower than PHY
  firewire: optimize gap count with 1394b leaf nodes
  firewire: remove unused macro
  firewire: missing newline in printk
  firewire: fw-sbp2: remove unused struct member
  ieee1394: remove old isochronous ABI
  ieee1394: sbp2: change some module parameters from int to bool
  ...

2 files changed, 16 insertions, 10 deletions

diff --git a/Documentation/ABI/removed/raw1394_legacy_isochronous b/Documentation/ABI/removed/raw1394_legacy_isochronous
new file mode 100644
index 000000000000..1b629622d883
--- /dev/null
+++ b/Documentation/ABI/removed/raw1394_legacy_isochronous
@@ -0,0 +1,16 @@
+What:           legacy isochronous ABI of raw1394 (1st generation iso ABI)
+Date:           June 2007 (scheduled), removed in kernel v2.6.23
+Contact:        linux1394-devel@lists.sourceforge.net
+Description:
+        The two request types RAW1394_REQ_ISO_SEND, RAW1394_REQ_ISO_LISTEN have
+        been deprecated for quite some time.  They are very inefficient as they
+        come with high interrupt load and several layers of callbacks for each
+        packet.  Because of these deficiencies, the video1394 and dv1394 drivers
+        and the 3rd-generation isochronous ABI in raw1394 (rawiso) were created.
+
+Users:
+        libraw1394 users via the long deprecated API raw1394_iso_write,
+        raw1394_start_iso_write, raw1394_start_iso_rcv, raw1394_stop_iso_rcv
+
+        libdc1394, which optionally uses these old libraw1394 calls
+        alternatively to the more efficient video1394 ABI
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 7d3f205b0ba5..51b369e7fc70 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -49,16 +49,6 @@ Who:	Adrian Bunk <bunk@stusta.de>
 
 ---------------------------
 
-What:   raw1394: requests of type RAW1394_REQ_ISO_SEND, RAW1394_REQ_ISO_LISTEN
-When:   June 2007
-Why:    Deprecated in favour of the more efficient and robust rawiso interface.
-        Affected are applications which use the deprecated part of libraw1394
-        (raw1394_iso_write, raw1394_start_iso_write, raw1394_start_iso_rcv,
-        raw1394_stop_iso_rcv) or bypass libraw1394.
-Who:    Dan Dennedy <dan@dennedy.org>, Stefan Richter <stefanr@s5r6.in-berlin.de>
-
----------------------------
-
 What:   old NCR53C9x driver
 When:   October 2007
 Why:    Replaced by the much better esp_scsi driver.  Actual low-level