Merge commit 'v2.6.37-rc1' into kbuild/kbuild

This commit is contained in:
Michal Marek
2010-12-14 22:01:55 +01:00
15045 changed files with 1540689 additions and 1108997 deletions

View File

@@ -144,7 +144,7 @@ config INITRAMFS_COMPRESSION_LZO
depends on RD_LZO
help
Its compression ratio is the poorest among the four. The kernel
size is about about 10% bigger than gzip; however its speed
size is about 10% bigger than gzip; however its speed
(both compression and decompression) is the fastest.
endchoice

View File

@@ -30,8 +30,8 @@ __irf_end:
.section .init.ramfs.info,"a"
.globl __initramfs_size
__initramfs_size:
#ifdef CONFIG_32BIT
.long __irf_end - __irf_start
#else
#ifdef CONFIG_64BIT
.quad __irf_end - __irf_start
#else
.long __irf_end - __irf_start
#endif