diff options
| author | Colin Cross <ccross@android.com> | 2011-08-10 18:04:51 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-08-10 18:04:51 -0700 |
| commit | 475fb9a997dbbfa5cad7e6e1d36a11bde23a4c70 (patch) | |
| tree | d890f57f258ec4f3e7e44f8d1db8b8a542386f67 /Documentation | |
| parent | 3083b105c519e15d2d98c6e8fd01e4468530a50f (diff) | |
| parent | 4e111751cfcb75f26d2725eab934b6eb91a3d115 (diff) | |
| download | kernel_samsung_tuna-475fb9a997dbbfa5cad7e6e1d36a11bde23a4c70.zip kernel_samsung_tuna-475fb9a997dbbfa5cad7e6e1d36a11bde23a4c70.tar.gz kernel_samsung_tuna-475fb9a997dbbfa5cad7e6e1d36a11bde23a4c70.tar.bz2 | |
Merge branch 'android-3.0' into android-omap-3.0
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/filesystems/nilfs2.txt | 1 | ||||
| -rw-r--r-- | Documentation/networking/ip-sysctl.txt | 2 | ||||
| -rw-r--r-- | Documentation/x86/boot.txt | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/Documentation/filesystems/nilfs2.txt b/Documentation/filesystems/nilfs2.txt index d5c0cef..873a2ab 100644 --- a/Documentation/filesystems/nilfs2.txt +++ b/Documentation/filesystems/nilfs2.txt @@ -40,7 +40,6 @@ Features which NILFS2 does not support yet: - POSIX ACLs - quotas - fsck - - resize - defragmentation Mount options diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt index d3d653a..bfe9242 100644 --- a/Documentation/networking/ip-sysctl.txt +++ b/Documentation/networking/ip-sysctl.txt @@ -346,7 +346,7 @@ tcp_orphan_retries - INTEGER when RTO retransmissions remain unacknowledged. See tcp_retries2 for more details. - The default value is 7. + The default value is 8. If your machine is a loaded WEB server, you should think about lowering this value, such sockets may consume significant resources. Cf. tcp_max_orphans. diff --git a/Documentation/x86/boot.txt b/Documentation/x86/boot.txt index 9b7221a..7c3a880 100644 --- a/Documentation/x86/boot.txt +++ b/Documentation/x86/boot.txt @@ -674,7 +674,7 @@ Protocol: 2.10+ Field name: init_size Type: read -Offset/size: 0x25c/4 +Offset/size: 0x260/4 This field indicates the amount of linear contiguous memory starting at the kernel runtime start address that the kernel needs before it |