Merge branch 'master' into upstream

Conflicts:

	drivers/scsi/libata-core.c
	drivers/scsi/libata-scsi.c
	include/linux/pci_ids.h

1 files changed, 13 insertions, 0 deletions

diff --git a/Documentation/ABI/obsolete/devfs b/Documentation/ABI/obsolete/devfs
new file mode 100644
index 000000000000..b8b87399bc8f
--- /dev/null
+++ b/Documentation/ABI/obsolete/devfs
@@ -0,0 +1,13 @@
+What:           devfs
+Date:           July 2005
+Contact:        Greg Kroah-Hartman <gregkh@suse.de>
+Description:
+        devfs has been unmaintained for a number of years, has unfixable
+        races, contains a naming policy within the kernel that is
+        against the LSB, and can be replaced by using udev.
+        The files fs/devfs/*, include/linux/devfs_fs*.h will be removed,
+        along with the the assorted devfs function calls throughout the
+        kernel tree.
+
+Users:
+