Merge branch 'linus' into release

Conflicts:
	drivers/acpi/debug.c

Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 4 insertions, 7 deletions

diff --git a/Documentation/blackfin/00-INDEX b/Documentation/blackfin/00-INDEX
index c34e12440fec..2df0365f2dff 100644
--- a/Documentation/blackfin/00-INDEX
+++ b/Documentation/blackfin/00-INDEX
@@ -1,11 +1,8 @@
 00-INDEX
         - This file
 
-cachefeatures.txt
-        - Supported cache features.
-
-Filesystems
-        - Requirements for mounting the root file system.
-
-bfin-gpio-note.txt
+bfin-gpio-notes.txt
         - Notes in developing/using bfin-gpio driver.
+
+bfin-spi-notes.txt
+        - Notes for using bfin spi bus driver.