Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (47 commits) doc: CONFIG_UNEVICTABLE_LRU doesn't exist anymore Update cpuset info & webiste for cgroups dcdbas: force SMI to happen when expected arch/arm/Kconfig: remove one to many l's in the word. asm-generic/user.h: Fix spelling in comment drm: fix printk typo 'sracth' Remove one to many n's in a word Documentation/filesystems/romfs.txt: fixing link to genromfs drivers:scsi Change printk typo initate -> initiate serial, pch uart: Remove duplicate inclusion of linux/pci.h header fs/eventpoll.c: fix spelling mm: Fix out-of-date comments which refers non-existent functions drm: Fix printk typo 'failled' coh901318.c: Change initate to initiate. mbox-db5500.c Change initate to initiate. edac: correct i82975x error-info reported edac: correct i82975x mci initialisation edac: correct commented info fs: update comments to point correct document target: remove duplicate include of target/target_core_device.h from drivers/target/target_core_hba.c ... Trivial conflict in fs/eventpoll.c (spelling vs addition)
Showing
- Documentation/cgroups/cpusets.txt 9 additions, 8 deletionsDocumentation/cgroups/cpusets.txt
- Documentation/cgroups/memory.txt 3 additions, 2 deletionsDocumentation/cgroups/memory.txt
- Documentation/device-mapper/dm-crypt.txt 1 addition, 1 deletionDocumentation/device-mapper/dm-crypt.txt
- Documentation/filesystems/romfs.txt 1 addition, 2 deletionsDocumentation/filesystems/romfs.txt
- Documentation/kbuild/kbuild.txt 1 addition, 1 deletionDocumentation/kbuild/kbuild.txt
- Documentation/kbuild/makefiles.txt 2 additions, 1 deletionDocumentation/kbuild/makefiles.txt
- Documentation/kvm/api.txt 48 additions, 48 deletionsDocumentation/kvm/api.txt
- Documentation/sysctl/kernel.txt 1 addition, 1 deletionDocumentation/sysctl/kernel.txt
- Documentation/vm/unevictable-lru.txt 1 addition, 2 deletionsDocumentation/vm/unevictable-lru.txt
- MAINTAINERS 8 additions, 7 deletionsMAINTAINERS
- Makefile 1 addition, 1 deletionMakefile
- arch/alpha/include/asm/cacheflush.h 1 addition, 1 deletionarch/alpha/include/asm/cacheflush.h
- arch/arm/mach-ux500/mbox-db5500.c 1 addition, 1 deletionarch/arm/mach-ux500/mbox-db5500.c
- arch/arm/plat-omap/Kconfig 1 addition, 1 deletionarch/arm/plat-omap/Kconfig
- arch/avr32/mm/cache.c 1 addition, 1 deletionarch/avr32/mm/cache.c
- arch/cris/arch-v10/mm/init.c 1 addition, 1 deletionarch/cris/arch-v10/mm/init.c
- arch/ia64/include/asm/perfmon.h 1 addition, 1 deletionarch/ia64/include/asm/perfmon.h
- arch/x86/kernel/apic/io_apic.c 1 addition, 1 deletionarch/x86/kernel/apic/io_apic.c
- arch/x86/oprofile/op_model_p4.c 1 addition, 1 deletionarch/x86/oprofile/op_model_p4.c
- arch/xtensa/configs/s6105_defconfig 1 addition, 1 deletionarch/xtensa/configs/s6105_defconfig
Loading
Please register or sign in to comment