Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block: Revert "mm: add /proc controls for pdflush threads" viocd: needs to depend on BLOCK block: fix the bio_vec array index out-of-bounds test
Showing
- Documentation/sysctl/vm.txt 0 additions, 28 deletionsDocumentation/sysctl/vm.txt
- arch/powerpc/platforms/iseries/Kconfig 1 addition, 0 deletionsarch/powerpc/platforms/iseries/Kconfig
- block/blk-core.c 2 additions, 2 deletionsblock/blk-core.c
- include/linux/writeback.h 0 additions, 2 deletionsinclude/linux/writeback.h
- kernel/sysctl.c 0 additions, 23 deletionskernel/sysctl.c
- mm/pdflush.c 12 additions, 19 deletionsmm/pdflush.c
Loading
Please register or sign in to comment