Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 16 insertions, 0 deletions

diff --git a/Documentation/ABI/removed/video1394 b/Documentation/ABI/removed/video1394
new file mode 100644
index 000000000000..c39c25aee77b
--- /dev/null
+++ b/Documentation/ABI/removed/video1394
@@ -0,0 +1,16 @@
+What:           video1394 (a.k.a. "OHCI-1394 Video support" for FireWire)
+Date:           May 2010 (scheduled), finally removed in kernel v2.6.37
+Contact:        linux1394-devel@lists.sourceforge.net
+Description:
+        /dev/video1394/* were character device files, one for each FireWire
+        controller, which were used for isochronous I/O.  It was added as an
+        alternative to raw1394's isochronous I/O functionality which had
+        performance issues in its first generation.  Any video1394 user had
+        to use raw1394 + libraw1394 too because video1394 did not provide
+        asynchronous I/O for device discovery and configuration.
+        Replaced by /dev/fw*, i.e. the <linux/firewire-cdev.h> ABI of
+        firewire-core.
+
+Users:
+        libdc1394 (works with firewire-cdev too, transparent to library ABI
+        users)