From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 15 Nov 2008 19:51:03 +0000 (-0800)
Subject: Merge branch 'doc-subdirs' of git://git.kernel.org/pub/scm/linux/kernel/git/rdunlap... 
X-Git-Tag: v2.6.28-rc5~4
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=fab349cceb25f92bac1400601c5ef8345a166958;p=linux-2.6-omap-h63xx.git

Merge branch 'doc-subdirs' of git://git.kernel.org/pub/scm/linux/kernel/git/rdunlap/linux-docs

* 'doc-subdirs' of git://git.kernel.org/pub/scm/linux/kernel/git/rdunlap/linux-docs:
  Create/use more directory structure in the Documentation/ tree.
---

fab349cceb25f92bac1400601c5ef8345a166958
diff --cc Documentation/00-INDEX
index 50f99eab0e1,2f969e2bece..2a39aeba146
--- a/Documentation/00-INDEX
+++ b/Documentation/00-INDEX
@@@ -290,16 -266,10 +266,12 @@@ powerpc
  	- directory with info on using Linux with the PowerPC.
  preempt-locking.txt
  	- info on locking under a preemptive kernel.
 +printk-formats.txt
 +	- how to get printk format specifiers right
  prio_tree.txt
  	- info on radix-priority-search-tree use for indexing vmas.
- ramdisk.txt
- 	- short guide on how to set up and use the RAM disk.
  rbtree.txt
  	- info on what red-black trees are and what they are for.
- riscom8.txt
- 	- notes on using the RISCom/8 multi-port serial driver.
  robust-futex-ABI.txt
  	- documentation of the robust futex ABI.
  robust-futexes.txt