diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2008-10-19 22:17:52 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2008-10-19 22:17:52 -0400 |
| commit | 4cb40f795af36b3deb743f6ccf6c3fd542c61c8d (patch) | |
| tree | db3d7519932549bf528f5b8e4cb8350356cd544d /Documentation/w1/00-INDEX | |
| parent | 79ed2a9216dd3cc35c4f2c5dbaddadb195af83ac (diff) | |
| parent | 0cfd81031a26717fe14380d18275f8e217571615 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
Documentation/kernel-parameters.txt
arch/sh/include/asm/elf.h
Diffstat (limited to 'Documentation/w1/00-INDEX')
| -rw-r--r-- | Documentation/w1/00-INDEX | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/w1/00-INDEX b/Documentation/w1/00-INDEX index 5270cf4cb109..cb49802745dc 100644 --- a/Documentation/w1/00-INDEX +++ b/Documentation/w1/00-INDEX | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 00-INDEX | 1 | 00-INDEX |
| 2 | - This file | 2 | - This file |
| 3 | slaves/ | ||
| 4 | - Drivers that provide support for specific family codes. | ||
| 3 | masters/ | 5 | masters/ |
| 4 | - Individual chips providing 1-wire busses. | 6 | - Individual chips providing 1-wire busses. |
| 5 | w1.generic | 7 | w1.generic |