diff options
| author | Michal Marek <mmarek@suse.cz> | 2010-10-12 09:09:06 -0400 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2010-10-12 09:09:06 -0400 |
| commit | 239060b93bb30a4ad55f1ecaa512464a035cc5ba (patch) | |
| tree | 77f79810e57d4fc24356eca0cd6db463e8994128 /Documentation/block/biodoc.txt | |
| parent | 1408b15b98635a13bad2e2a50b3c2ae2ccdf625b (diff) | |
| parent | e9203c988234aa512bd45ca32b52e21c7bbfc414 (diff) | |
Merge branch 'kbuild/rc-fixes' into kbuild/kconfig
We need to revert the temporary hack in 71ebc01, hence the merge.
Diffstat (limited to 'Documentation/block/biodoc.txt')
| -rw-r--r-- | Documentation/block/biodoc.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/block/biodoc.txt b/Documentation/block/biodoc.txt index 508b5b2b0289..b9a83dd24732 100644 --- a/Documentation/block/biodoc.txt +++ b/Documentation/block/biodoc.txt | |||
| @@ -7,7 +7,7 @@ Notes Written on Jan 15, 2002: | |||
| 7 | 7 | ||
| 8 | Last Updated May 2, 2002 | 8 | Last Updated May 2, 2002 |
| 9 | September 2003: Updated I/O Scheduler portions | 9 | September 2003: Updated I/O Scheduler portions |
| 10 | Nick Piggin <piggin@cyberone.com.au> | 10 | Nick Piggin <npiggin@kernel.dk> |
| 11 | 11 | ||
| 12 | Introduction: | 12 | Introduction: |
| 13 | 13 | ||